From 7113ea4e08fdc9ca12b8e7a4829d749923029941 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 29 Dec 2011 14:23:47 -0600 Subject: Fix bogus string cast in search debug message Signed-off-by: Dan McGee --- lib/libalpm/db.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 7708d18f..8688a3cd 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -429,7 +429,7 @@ alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles) for(k = alpm_pkg_get_provides(pkg); k; k = k->next) { alpm_depend_t *provide = k->data; if(regexec(®, provide->name, 0, 0, 0) == 0) { - matched = k->data; + matched = provide->name; break; } } @@ -445,8 +445,8 @@ alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles) } if(matched != NULL) { - _alpm_log(db->handle, ALPM_LOG_DEBUG, " search target '%s' matched '%s'\n", - targ, matched); + _alpm_log(db->handle, ALPM_LOG_DEBUG, + "search target '%s' matched '%s'\n", targ, matched); ret = alpm_list_add(ret, pkg); } } -- cgit v1.2.3-24-g4f1b From 6507fd6bf0a05dfd65bc035ffca1f8941b784801 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 24 Dec 2011 20:21:51 +1000 Subject: Prevent rebuild of man pages when using release tarballs Commit 43cad9c8 made the building of all docs depend on the Makefile. However, the Makefile is generated after running ./configure so is always newer than any pregenerated docs. This means that people building from released pacman tarballs are forced to rebuild the docs (and thus have asciidoc installed). That defeats the purpose of prebuilding the documentation. Have the documentatin depends on Makefile.am instead as this is probably what was intended. Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- doc/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index f449e727..4c1700b9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -118,7 +118,7 @@ A2X_OPTS = \ --destination-dir='./' # These rules are due to the includes and files of the asciidoc text -$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile +$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile.am a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt %.html: %.txt @@ -130,8 +130,8 @@ HACKING.html: ../HACKING dos2unix $@ # Customizations for certain HTML docs -$(HTML_MANPAGES): asciidoc.conf footer.txt Makefile -$(HTML_OTHER): asciidoc.conf Makefile +$(HTML_MANPAGES): asciidoc.conf footer.txt Makefile.am +$(HTML_OTHER): asciidoc.conf Makefile.am %.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons -a max-width=960px -a stylesheet=asciidoc-override.css %.8.html: ASCIIDOC_OPTS += -d manpage %.5.html: ASCIIDOC_OPTS += -d manpage -- cgit v1.2.3-24-g4f1b From f1d9b0a74a9e38dc9e6153eac76f4c2482fd24aa Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Mon, 2 Jan 2012 17:14:40 -0500 Subject: add new pactest for syncfirst with recursive deps Add 1 failing for the -Su case, and the same case using -S (and passing). This is based on a real (current) issue of upgrading staging chroots with the new pacman in staging for a libarchive build, and a new toolchain in testing. Signed-off-by: Dave Reisner Signed-off-by: Dan McGee --- test/pacman/tests/sync305.py | 67 ++++++++++++++++++++++++++++++++++++++++++++ test/pacman/tests/sync306.py | 63 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 test/pacman/tests/sync305.py create mode 100644 test/pacman/tests/sync306.py diff --git a/test/pacman/tests/sync305.py b/test/pacman/tests/sync305.py new file mode 100644 index 00000000..24fcee48 --- /dev/null +++ b/test/pacman/tests/sync305.py @@ -0,0 +1,67 @@ +self.description = "Sysupgrade: syncfirst with recursive/cascading deps" + +sp = pmpkg("pacman", "4.0.1-2") +sp.depends = ["glibc>=2.15", "curl"] +self.addpkg2db("sync", sp) + +glibcdep = pmpkg("glibc", "2.15-1") +self.addpkg2db("sync", glibcdep) + +gcldep = pmpkg("gcc-libs", "4.6.2-5") +gcldep.depends = ["glibc>=2.14"] +self.addpkg2db("sync", gcldep) + +curldep = pmpkg("curl", "7.23.1-2") +curldep.depends = ["openssl"] +self.addpkg2db("sync", curldep) + +openssldep = pmpkg("openssl", "1.0.0.e-1") +openssldep.depends = ["perl"] +self.addpkg2db("sync", openssldep) + +gccdep = pmpkg("gcc", "4.6.2-5") +gccdep.depends = ["gcc-libs=4.6.2-5"] +self.addpkg2db("sync", gccdep) + +perldep = pmpkg("perl", "5.14.2-5") +perldep.depends = ["db"] +self.addpkg2db("sync", perldep) + +dbdep = pmpkg("db", "5.2.36-2") +dbdep.depends = ["gcc-libs"] +self.addpkg2db("sync", dbdep) + + +lp = pmpkg("pacman", "4.0.1-1") +lp.depends = ["glibc>=2.14", "curl"] +self.addpkg2db("local", lp) + +lp2 = pmpkg("glibc", "2.14-2") +self.addpkg2db("local", lp2) + +lp3 = pmpkg("curl", "7.23.1-2") +self.addpkg2db("local", lp3) + +lp4 = pmpkg("gcc-libs", "4.6.2-3") +self.addpkg2db("local", lp4) + +lp5 = pmpkg("gcc", "4.6.2-3") +lp5.depends = ["gcc-libs=4.6.2-3"] +self.addpkg2db("local", lp5) + +lp6 = pmpkg("perl", "5.14.2-5") +lp6.depends = ["db"] +self.addpkg2db("local", lp6) + +lp7 = pmpkg("db", "5.2.36-2") +lp7.depends = ["gcc-libs"] +self.addpkg2db("local", lp7) + +self.option["SyncFirst"] = ["pacman"] + +self.args = "-Su" +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pacman") +self.addrule("PKG_VERSION=pacman|4.0.1-2") + +self.expectfailure = True diff --git a/test/pacman/tests/sync306.py b/test/pacman/tests/sync306.py new file mode 100644 index 00000000..ca7a547e --- /dev/null +++ b/test/pacman/tests/sync306.py @@ -0,0 +1,63 @@ +self.description = "install with recursive/cascading deps" + +sp = pmpkg("pacman", "4.0.1-2") +sp.depends = ["glibc>=2.15", "curl"] +self.addpkg2db("sync", sp) + +glibcdep = pmpkg("glibc", "2.15-1") +self.addpkg2db("sync", glibcdep) + +gcldep = pmpkg("gcc-libs", "4.6.2-5") +gcldep.depends = ["glibc>=2.14"] +self.addpkg2db("sync", gcldep) + +curldep = pmpkg("curl", "7.23.1-2") +curldep.depends = ["openssl"] +self.addpkg2db("sync", curldep) + +openssldep = pmpkg("openssl", "1.0.0.e-1") +openssldep.depends = ["perl"] +self.addpkg2db("sync", openssldep) + +gccdep = pmpkg("gcc", "4.6.2-5") +gccdep.depends = ["gcc-libs=4.6.2-5"] +self.addpkg2db("sync", gccdep) + +perldep = pmpkg("perl", "5.14.2-5") +perldep.depends = ["db"] +self.addpkg2db("sync", perldep) + +dbdep = pmpkg("db", "5.2.36-2") +dbdep.depends = ["gcc-libs"] +self.addpkg2db("sync", dbdep) + + +lp = pmpkg("pacman", "4.0.1-1") +lp.depends = ["glibc>=2.14", "curl"] +self.addpkg2db("local", lp) + +lp2 = pmpkg("glibc", "2.14-2") +self.addpkg2db("local", lp2) + +lp3 = pmpkg("curl", "7.23.1-2") +self.addpkg2db("local", lp3) + +lp4 = pmpkg("gcc-libs", "4.6.2-3") +self.addpkg2db("local", lp4) + +lp5 = pmpkg("gcc", "4.6.2-3") +lp5.depends = ["gcc-libs=4.6.2-3"] +self.addpkg2db("local", lp5) + +lp6 = pmpkg("perl", "5.14.2-5") +lp6.depends = ["db"] +self.addpkg2db("local", lp6) + +lp7 = pmpkg("db", "5.2.36-2") +lp7.depends = ["gcc-libs"] +self.addpkg2db("local", lp7) + +self.args = "-S pacman" +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pacman") +self.addrule("PKG_VERSION=pacman|4.0.1-2") -- cgit v1.2.3-24-g4f1b