- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Remove alpm_find_pkg_satisfiers and _alpm_find_dep_satisfiers
by Nagy Gabor 05 Jul '08

05 Jul '08

From 9a84f6ca501492441948a5c22ce73416f5a817f3 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 5 Jul 2008 13:06:02 +0200 Subject: [PATCH] Remove alpm_find_pkg_satisfiers and _alpm_find_dep_satisfiers After sync_addtarget reworks, these functions weren't used. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 1 - lib/libalpm/deps.c | 26 -------------------------- lib/libalpm/deps.h | 1 - 3 files changed, 0 insertions(+), 28 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 9ed2c67..fbef057 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -433,7 +433,6 @@ int alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep); alpm_list_t *alpm_checkdeps(pmdb_t *db, int reversedeps, alpm_list_t *remove, alpm_list_t *upgrade); alpm_list_t *alpm_deptest(pmdb_t *db, alpm_list_t *targets); -alpm_list_t *alpm_find_pkg_satisfiers(alpm_list_t *pkgs, const char *pkgname); const char *alpm_miss_get_target(const pmdepmissing_t *miss); pmdepend_t *alpm_miss_get_dep(pmdepmissing_t *miss); diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index e042166..b58deea 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -202,32 +202,6 @@ pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep) return(NULL); } -alpm_list_t *_alpm_find_dep_satisfiers(alpm_list_t *pkgs, pmdepend_t *dep) -{ - alpm_list_t *i, *ret = NULL; - - for(i = pkgs; i; i = alpm_list_next(i)) { - pmpkg_t *pkg = i->data; - if(alpm_depcmp(pkg, dep)) { - ret = alpm_list_add(ret, pkg); - } - } - return(ret); -} - -/** Find packages in a list that provide a given package. - * @param pkgs an alpm_list_t* of package to search - * @param pkgname the name of the package - * @return an alpm_list_t* of packages that provide pkgname - */ -alpm_list_t SYMEXPORT *alpm_find_pkg_satisfiers(alpm_list_t *pkgs, const char *pkgname) -{ - pmdepend_t *dep = _alpm_splitdep(pkgname); - alpm_list_t *res = _alpm_find_dep_satisfiers(pkgs, dep); - _alpm_dep_free(dep); - return(res); -} - /** Checks dependencies and returns missing ones in a list. * Dependencies can include versions with depmod operators. * @param db pointer to the local package database diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 0b93951..6cd4c63 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -53,7 +53,6 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list, int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2); pmdepend_t *_alpm_splitdep(const char *depstring); pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep); -alpm_list_t *_alpm_find_dep_satisfiers(alpm_list_t *pkgs, pmdepend_t *dep); #endif /* _ALPM_DEPS_H */ -- 1.5.6.1

1 0

[pacman-dev] [PATCH] Modify sync1003.py pactest
by Nagy Gabor 05 Jul '08

05 Jul '08

From 6ef3a1f84dca7559506a6ab4b94b92c4ac746df6 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 5 Jul 2008 11:08:03 +0200 Subject: [PATCH] Modify sync1003.py pactest Now it tests a more interesting case. (The old version failed with the new resolvedeps.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- pactest/tests/sync1003.py | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pactest/tests/sync1003.py b/pactest/tests/sync1003.py index 3fd9799..cd98063 100644 --- a/pactest/tests/sync1003.py +++ b/pactest/tests/sync1003.py @@ -4,23 +4,18 @@ sp1 = pmpkg("pkg1", "1.0-2") sp1.replaces = [ "pkg2" ] self.addpkg2db("sync", sp1) -sp2 = pmpkg("pkg2", "1.0-2") -self.addpkg2db("sync", sp2) - -sp3 = pmpkg("pkg3", "1.0-2") -sp3.depends = ["pkg2=1.0-2"] -self.addpkg2db("sync", sp3) - -lp1 = pmpkg("pkg1", "1.0-1") -self.addpkg2db("local", lp1) - -lp2 = pmpkg("pkg2", "1.0-2") +lp2 = pmpkg("pkg2", "1.0-1") self.addpkg2db("local", lp2) lp3 = pmpkg("pkg3", "1.0-1") +lp3.depends = [ "pkg2=1.0" ] self.addpkg2db("local", lp3) self.args = "-Su" self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") +self.addrule("PKG_EXIST=pkg3") +self.addrule("PKG_VERSION=pkg2|1.0-1") +self.addrule("PKG_VERSION=pkg3|1.0-1") -- 1.5.6.1

1 0

[pacman-dev] [PATCH] Remove requiredby from pactests
by Nagy Gabor 05 Jul '08

05 Jul '08

From 2adc17767b1af4e46502f21f5061e19d7a60a4b2 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 5 Jul 2008 10:48:26 +0200 Subject: [PATCH] Remove requiredby from pactests Also remove some meaningless pactests (broken requiredby, requiredby*.py tests) requiredby001.py was renamed to upgrade076.py Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- pactest/tests/remove040.py | 3 --- pactest/tests/remove041.py | 2 -- pactest/tests/remove042.py | 2 -- pactest/tests/remove043.py | 3 --- pactest/tests/remove045.py | 3 --- pactest/tests/remove046.py | 10 ---------- pactest/tests/remove047.py | 1 - pactest/tests/remove048.py | 10 ---------- pactest/tests/remove049.py | 1 - pactest/tests/requiredby001.py | 20 -------------------- pactest/tests/requiredby002.py | 16 ---------------- pactest/tests/requiredby003.py | 16 ---------------- pactest/tests/requiredby004.py | 20 -------------------- pactest/tests/requiredby005.py | 21 --------------------- pactest/tests/requiredby006.py | 21 --------------------- pactest/tests/sync010.py | 2 -- pactest/tests/sync060.py | 15 --------------- pactest/tests/sync1000.py | 2 -- pactest/tests/sync300.py | 1 - pactest/tests/sync400.py | 1 - pactest/tests/sync895.py | 2 -- pactest/tests/sync896.py | 2 -- pactest/tests/sync900.py | 3 --- pactest/tests/sync901.py | 3 --- pactest/tests/upgrade052.py | 1 - pactest/tests/upgrade053.py | 1 - pactest/tests/upgrade054.py | 1 - pactest/tests/upgrade055.py | 3 --- pactest/tests/upgrade056.py | 4 ---- pactest/tests/upgrade057.py | 2 -- pactest/tests/upgrade058.py | 1 - pactest/tests/upgrade059.py | 2 -- pactest/tests/upgrade060.py | 1 - pactest/tests/upgrade061.py | 1 - pactest/tests/upgrade073.py | 2 -- pactest/tests/upgrade076.py | 18 ++++++++++++++++++ 36 files changed, 18 insertions(+), 199 deletions(-) delete mode 100644 pactest/tests/remove046.py delete mode 100644 pactest/tests/remove048.py delete mode 100644 pactest/tests/requiredby001.py delete mode 100644 pactest/tests/requiredby002.py delete mode 100644 pactest/tests/requiredby003.py delete mode 100644 pactest/tests/requiredby004.py delete mode 100644 pactest/tests/requiredby005.py delete mode 100644 pactest/tests/requiredby006.py delete mode 100644 pactest/tests/sync060.py create mode 100644 pactest/tests/upgrade076.py diff --git a/pactest/tests/remove040.py b/pactest/tests/remove040.py index 07d3e67..9d95b60 100644 --- a/pactest/tests/remove040.py +++ b/pactest/tests/remove040.py @@ -6,13 +6,10 @@ self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") lp2.provides = ["imaginary"] -lp2.requiredby = [ "pkg1" ] self.addpkg2db("local", lp2) - self.args = "-R %s" % lp1.name self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") -self.addrule("!PKG_REQUIREDBY=pkg2|pkg1") diff --git a/pactest/tests/remove041.py b/pactest/tests/remove041.py index 9ab7bf7..be27fd4 100644 --- a/pactest/tests/remove041.py +++ b/pactest/tests/remove041.py @@ -2,12 +2,10 @@ self.description = "Remove a no longer needed package (multiple provision)" lp1 = pmpkg("pkg1") lp1.provides = ["imaginary"] -lp1.requiredby = ["pkg3"] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") lp2.provides = ["imaginary"] -lp2.requiredby = ["pkg3"] self.addpkg2db("local", lp2) lp3 = pmpkg("pkg3") diff --git a/pactest/tests/remove042.py b/pactest/tests/remove042.py index 5de1fb4..796d040 100644 --- a/pactest/tests/remove042.py +++ b/pactest/tests/remove042.py @@ -6,10 +6,8 @@ self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") lp2.provides = ["imaginary"] -lp2.requiredby = [ "pkg1" ] self.addpkg2db("local", lp2) - self.args = "-Rc %s" % lp2.name self.addrule("PACMAN_RETCODE=0") diff --git a/pactest/tests/remove043.py b/pactest/tests/remove043.py index a377c58..0d448d0 100644 --- a/pactest/tests/remove043.py +++ b/pactest/tests/remove043.py @@ -6,13 +6,10 @@ self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") lp2.provides = ["imaginary"] -lp2.requiredby = [ "pkg1" ] self.addpkg2db("local", lp2) - self.args = "-R %s" % lp2.name self.addrule("!PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") -self.addrule("PKG_REQUIREDBY=pkg2|pkg1") diff --git a/pactest/tests/remove045.py b/pactest/tests/remove045.py index d8b7845..f42e58f 100644 --- a/pactest/tests/remove045.py +++ b/pactest/tests/remove045.py @@ -7,18 +7,15 @@ self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") lp2.reason = 1 lp2.depends = ["pkg4"] -lp2.requiredby = ["pkg1"] self.addpkg2db("local", lp2) lp3 = pmpkg("pkg3") lp3.reason = 1 -lp3.requiredby = ["pkg1", "pkg4"] self.addpkg2db("local", lp3) lp4 = pmpkg("pkg4") lp4.reason = 1 lp4.depends = ["pkg3"] -lp4.requiredby = ["pkg2"] self.addpkg2db("local", lp4) self.args = "-Rs %s" % lp1.name diff --git a/pactest/tests/remove046.py b/pactest/tests/remove046.py deleted file mode 100644 index 1ee8be1..0000000 --- a/pactest/tests/remove046.py +++ /dev/null @@ -1,10 +0,0 @@ -self.description = "Cascade remove a package with a broken required by" - -lp1 = pmpkg("pkg1") -lp1.requiredby = [ "fake" ] -self.addpkg2db("local", lp1) - -self.args = "-Rc %s" % lp1.name - -self.addrule("PACMAN_RETCODE=0") -self.addrule("!PKG_EXIST=pkg1") diff --git a/pactest/tests/remove047.py b/pactest/tests/remove047.py index 9606c2e..8bb1a63 100644 --- a/pactest/tests/remove047.py +++ b/pactest/tests/remove047.py @@ -1,7 +1,6 @@ self.description = "Remove a package required by other packages" lp1 = pmpkg("pkg1") -lp1.requiredby = ["pkg2", "pkg3", "pkg4"] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") diff --git a/pactest/tests/remove048.py b/pactest/tests/remove048.py deleted file mode 100644 index 2d9b480..0000000 --- a/pactest/tests/remove048.py +++ /dev/null @@ -1,10 +0,0 @@ -self.description = "Remove a package with a broken required by" - -lp1 = pmpkg("pkg1") -lp1.requiredby = [ "dep" ] -self.addpkg2db("local", lp1) - -self.args = "-R %s" % lp1.name - -self.addrule("PACMAN_RETCODE=0") -self.addrule("!PKG_EXIST=pkg1") diff --git a/pactest/tests/remove049.py b/pactest/tests/remove049.py index 724f8da..a033629 100644 --- a/pactest/tests/remove049.py +++ b/pactest/tests/remove049.py @@ -1,7 +1,6 @@ self.description = "-Ru test" lp1 = pmpkg("pkg1") -lp1.requiredby = [ "pkg3" ] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") diff --git a/pactest/tests/requiredby001.py b/pactest/tests/requiredby001.py deleted file mode 100644 index 0f05d82..0000000 --- a/pactest/tests/requiredby001.py +++ /dev/null @@ -1,20 +0,0 @@ -self.description = "A package is downgraded no longer satisfying a depend" - -lp1 = pmpkg("pkg1") -lp1.depends = ["pkg2=1.1"] -self.addpkg2db("local", lp1) - -lp2 = pmpkg("pkg2", "1.1-1") -lp2.requiredby = ["pkg1"] -self.addpkg2db("local", lp2) - -p = pmpkg("pkg2", "1.0-1") -self.addpkg(p) - -self.args = "-U %s" % p.filename() - -self.addrule("PACMAN_RETCODE=1") -self.addrule("PKG_EXIST=pkg1") -self.addrule("PKG_VERSION=pkg2|1.1-1") -self.addrule("PKG_EXIST=pkg2") -self.addrule("PKG_REQUIREDBY=pkg2|pkg1") diff --git a/pactest/tests/requiredby002.py b/pactest/tests/requiredby002.py deleted file mode 100644 index 299ec88..0000000 --- a/pactest/tests/requiredby002.py +++ /dev/null @@ -1,16 +0,0 @@ -self.description = "A package was removed with -Rd, then downgraded" - -lp1 = pmpkg("pkg1") -lp1.depends = ["pkg2=1.1"] -self.addpkg2db("local", lp1) - -p = pmpkg("pkg2", "1.0-1") -self.addpkg(p) - -self.args = "-U %s" % p.filename() - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pkg1") -self.addrule("PKG_VERSION=pkg2|1.0-1") -self.addrule("PKG_EXIST=pkg2") -self.addrule("!PKG_REQUIREDBY=pkg2|pkg1") diff --git a/pactest/tests/requiredby003.py b/pactest/tests/requiredby003.py deleted file mode 100644 index 3279c2a..0000000 --- a/pactest/tests/requiredby003.py +++ /dev/null @@ -1,16 +0,0 @@ -self.description = "A package was removed with -Rd, then upgraded" - -lp1 = pmpkg("pkg1") -lp1.depends = ["pkg2>=1.1"] -self.addpkg2db("local", lp1) - -p = pmpkg("pkg2", "1.2-1") -self.addpkg(p) - -self.args = "-U %s" % p.filename() - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pkg1") -self.addrule("PKG_VERSION=pkg2|1.2-1") -self.addrule("PKG_EXIST=pkg2") -self.addrule("PKG_REQUIREDBY=pkg2|pkg1") diff --git a/pactest/tests/requiredby004.py b/pactest/tests/requiredby004.py deleted file mode 100644 index c4fe768..0000000 --- a/pactest/tests/requiredby004.py +++ /dev/null @@ -1,20 +0,0 @@ -self.description = "Upgrade a package that no longer needs a depend" - -lp1 = pmpkg("pkg1") -lp1.depends = ["pkg2"] -self.addpkg2db("local", lp1) - -lp2 = pmpkg("pkg2") -lp2.requiredby = ["pkg1"] -self.addpkg2db("local", lp2) - -p = pmpkg("pkg1", "1.1-1") -self.addpkg(p) - -self.args = "-U %s" % p.filename() - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pkg1") -self.addrule("PKG_VERSION=pkg1|1.1-1") -self.addrule("PKG_EXIST=pkg2") -self.addrule("!PKG_REQUIREDBY=pkg2|pkg1") diff --git a/pactest/tests/requiredby005.py b/pactest/tests/requiredby005.py deleted file mode 100644 index 5b2ce16..0000000 --- a/pactest/tests/requiredby005.py +++ /dev/null @@ -1,21 +0,0 @@ -self.description = "Remove lp1, requiredby should move from lp1 to lp2" - -lp1 = pmpkg("foo") -lp1.requiredby = ["pkg3"] -self.addpkg2db("local", lp1) - -lp2 = pmpkg("pkg2") -lp2.provides = ["foo"] -self.addpkg2db("local", lp2) - -lp3 = pmpkg("pkg3") -lp3.depends = ["foo"] -self.addpkg2db("local", lp3) - - -self.args = "-R %s" % lp1.name - -self.addrule("PACMAN_RETCODE=0") -self.addrule("!PKG_EXIST=foo") -self.addrule("PKG_EXIST=pkg2") -self.addrule("PKG_REQUIREDBY=pkg2|pkg3") diff --git a/pactest/tests/requiredby006.py b/pactest/tests/requiredby006.py deleted file mode 100644 index ea14cde..0000000 --- a/pactest/tests/requiredby006.py +++ /dev/null @@ -1,21 +0,0 @@ -self.description = "Broken requiredby/depends list" - -lp1 = pmpkg("pkg1") -lp1.depends = ["pkg2"] -self.addpkg2db("local", lp1) - -lp2 = pmpkg("pkg2") -lp2.requiredby = ["foo", "pkg1"] -self.addpkg2db("local", lp2) - -p = pmpkg("pkg1", "1.1-1") -p.depends = ["pkg2"] -self.addpkg(p) - -self.args = "-U %s" % p.filename() - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pkg1") -self.addrule("PKG_VERSION=pkg1|1.1-1") -self.addrule("PKG_EXIST=pkg2") -self.addrule("PKG_REQUIREDBY=pkg2|pkg1") diff --git a/pactest/tests/sync010.py b/pactest/tests/sync010.py index 7ddc149..df407a3 100644 --- a/pactest/tests/sync010.py +++ b/pactest/tests/sync010.py @@ -25,5 +25,3 @@ for p in sp1, sp2, sp3: for f in p.files: self.addrule("FILE_EXIST=%s" % f) self.addrule("PKG_DEPENDS=dep1|dep2") -self.addrule("PKG_REQUIREDBY=dep1|dummy") -self.addrule("PKG_REQUIREDBY=dep2|dep1") diff --git a/pactest/tests/sync060.py b/pactest/tests/sync060.py deleted file mode 100644 index 45f0c3e..0000000 --- a/pactest/tests/sync060.py +++ /dev/null @@ -1,15 +0,0 @@ -self.description = "Replace a package with a broken required by" - -lp1 = pmpkg("pkg1") -lp1.replaces = [ "pkg2" ] -self.addpkg2db("sync", lp1) - -lp2 = pmpkg("pkg2") -lp2.requiredby = [ "fake" ] -self.addpkg2db("local", lp2) - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pkg1") -self.addrule("!PKG_EXIST=pkg2") diff --git a/pactest/tests/sync1000.py b/pactest/tests/sync1000.py index be1254b..e7f4326 100644 --- a/pactest/tests/sync1000.py +++ b/pactest/tests/sync1000.py @@ -2,11 +2,9 @@ self.description = "stonecrest's problem" sp = pmpkg("dummy", "1.1-1") -sp.requiredby = [ "pkg" ] self.addpkg2db("sync", sp) lp1 = pmpkg("dummy", "1.0-1") -lp1.requiredby = [ "pkg" ] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg") diff --git a/pactest/tests/sync300.py b/pactest/tests/sync300.py index 85fb850..31b520a 100644 --- a/pactest/tests/sync300.py +++ b/pactest/tests/sync300.py @@ -12,4 +12,3 @@ self.args = "-S %s" % sp1.name self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") -self.addrule("!PKG_REQUIREDBY=pkg2|pkg1") diff --git a/pactest/tests/sync400.py b/pactest/tests/sync400.py index 2ee1095..dd6aaf4 100644 --- a/pactest/tests/sync400.py +++ b/pactest/tests/sync400.py @@ -13,7 +13,6 @@ lp1.depends = ["pkg2=1.0-1"] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2", "1.0-1") -lp2.requiredby = [ "pkg1" ] self.addpkg2db("local", lp2) self.args = "-S pkg1" diff --git a/pactest/tests/sync895.py b/pactest/tests/sync895.py index 03ddc74..1b348c1 100644 --- a/pactest/tests/sync895.py +++ b/pactest/tests/sync895.py @@ -6,7 +6,6 @@ self.addpkg2db("sync", sp) lp1 = pmpkg("pkg1") lp1.provides = ["foo"] -lp1.requiredby = ["pkg2"] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") @@ -19,4 +18,3 @@ self.addrule("PACMAN_RETCODE=1") self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") self.addrule("!PKG_EXIST=pkg3") -self.addrule("PKG_REQUIREDBY=pkg1|pkg2") diff --git a/pactest/tests/sync896.py b/pactest/tests/sync896.py index 830b719..a89b5c7 100644 --- a/pactest/tests/sync896.py +++ b/pactest/tests/sync896.py @@ -7,7 +7,6 @@ self.addpkg2db("sync", sp) lp1 = pmpkg("pkg1") lp1.provides = ["foo"] -lp1.requiredby = ["pkg2"] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") @@ -20,4 +19,3 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") self.addrule("PKG_EXIST=pkg3") -self.addrule("PKG_REQUIREDBY=pkg3|pkg2") diff --git a/pactest/tests/sync900.py b/pactest/tests/sync900.py index f21af06..16dfee1 100644 --- a/pactest/tests/sync900.py +++ b/pactest/tests/sync900.py @@ -6,7 +6,6 @@ sp.conflicts = ["foo"] self.addpkg2db("sync", sp) lp = pmpkg("foo") -lp.requiredby = ["lp1", "lp2"] self.addpkg2db("local", lp) lp1 = pmpkg("pkg1") @@ -23,6 +22,4 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=foo") self.addrule("PKG_EXIST=bar") self.addrule("PKG_EXIST=pkg1") -self.addrule("PKG_REQUIREDBY=bar|pkg1") self.addrule("PKG_EXIST=pkg2") -self.addrule("PKG_REQUIREDBY=bar|pkg2") diff --git a/pactest/tests/sync901.py b/pactest/tests/sync901.py index 423fe42..bb420b7 100644 --- a/pactest/tests/sync901.py +++ b/pactest/tests/sync901.py @@ -6,7 +6,6 @@ self.addpkg2db("sync", sp) lp = pmpkg("bar") lp.provides = ["foo"] lp.conflicts = ["foo"] -lp.requiredby = ["lp1", "lp2"] self.addpkg2db("local", lp) lp1 = pmpkg("pkg1") @@ -23,6 +22,4 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=foo") self.addrule("!PKG_EXIST=bar") self.addrule("PKG_EXIST=pkg1") -self.addrule("PKG_REQUIREDBY=foo|pkg1") self.addrule("PKG_EXIST=pkg2") -self.addrule("PKG_REQUIREDBY=foo|pkg2") diff --git a/pactest/tests/upgrade052.py b/pactest/tests/upgrade052.py index 7db85df..7000a12 100644 --- a/pactest/tests/upgrade052.py +++ b/pactest/tests/upgrade052.py @@ -6,7 +6,6 @@ self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") lp2.provides = ["imaginary", "real"] -lp2.requiredby = [ "pkg1" ] self.addpkg2db("local", lp2) p = pmpkg("pkg2", "1.0-2") diff --git a/pactest/tests/upgrade053.py b/pactest/tests/upgrade053.py index 4cbaa1f..78de0b5 100644 --- a/pactest/tests/upgrade053.py +++ b/pactest/tests/upgrade053.py @@ -17,4 +17,3 @@ self.args = "-U %s" % p.filename() self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=pkg1|1.0-2") self.addrule("PKG_EXIST=pkg2") -self.addrule("PKG_REQUIREDBY=pkg2|pkg1") diff --git a/pactest/tests/upgrade054.py b/pactest/tests/upgrade054.py index b60f15f..817d1b3 100644 --- a/pactest/tests/upgrade054.py +++ b/pactest/tests/upgrade054.py @@ -17,4 +17,3 @@ self.args = "-U %s" % p.filename() self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=pkg1|1.0-2") self.addrule("PKG_EXIST=pkg2") -self.addrule("PKG_REQUIREDBY=pkg2|pkg1") diff --git a/pactest/tests/upgrade055.py b/pactest/tests/upgrade055.py index 7cdf6b5..2508396 100644 --- a/pactest/tests/upgrade055.py +++ b/pactest/tests/upgrade055.py @@ -6,12 +6,10 @@ self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") lp2.provides = ["imaginary"] -lp2.requiredby = [ "pkg1" ] self.addpkg2db("local", lp2) lp3 = pmpkg("pkg3") lp3.provides = ["imaginary2"] -lp3.requiredby = [ "pkg1" ] self.addpkg2db("local", lp3) p = pmpkg("pkg2", "1.0-2") @@ -24,5 +22,4 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_VERSION=pkg2|1.0-2") self.addrule("PKG_EXIST=pkg3") -self.addrule("PKG_REQUIREDBY=pkg2|pkg1") self.addrule("PKG_DEPENDS=pkg1|imaginary") diff --git a/pactest/tests/upgrade056.py b/pactest/tests/upgrade056.py index b92c38a..908fa30 100644 --- a/pactest/tests/upgrade056.py +++ b/pactest/tests/upgrade056.py @@ -6,12 +6,10 @@ self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") lp2.provides = ["imaginary"] -lp2.requiredby = [ "pkg1" ] self.addpkg2db("local", lp2) lp3 = pmpkg("pkg3") lp3.provides = ["imaginary"] -lp3.requiredby = [ "pkg1" ] self.addpkg2db("local", lp3) p = pmpkg("pkg2", "1.0-2") @@ -23,5 +21,3 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_VERSION=pkg2|1.0-2") self.addrule("PKG_EXIST=pkg3") -self.addrule("!PKG_REQUIREDBY=pkg2|pkg1") -self.addrule("PKG_REQUIREDBY=pkg3|pkg1") diff --git a/pactest/tests/upgrade057.py b/pactest/tests/upgrade057.py index fd3e713..b1eb502 100644 --- a/pactest/tests/upgrade057.py +++ b/pactest/tests/upgrade057.py @@ -6,7 +6,6 @@ self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") lp2.provides = ["imag3"] -lp2.requiredby = ["pkg1"] self.addpkg2db("local", lp2) p = pmpkg("pkg2", "1.0-2") @@ -18,6 +17,5 @@ self.args = "-U %s" % p.filename() self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_VERSION=pkg2|1.0-2") -self.addrule("PKG_REQUIREDBY=pkg2|pkg1") self.addrule("PKG_DEPENDS=pkg1|pkg2") self.addrule("PKG_DEPENDS=pkg1|imag3") diff --git a/pactest/tests/upgrade058.py b/pactest/tests/upgrade058.py index 109289e..38576ff 100644 --- a/pactest/tests/upgrade058.py +++ b/pactest/tests/upgrade058.py @@ -5,7 +5,6 @@ lp1.depends = [ "pkg2=1.0" ] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2", "1.0-1") -lp2.requiredby = [ "pkg1" ] self.addpkg2db("local", lp2) p = pmpkg("pkg2", "1.1-1") diff --git a/pactest/tests/upgrade059.py b/pactest/tests/upgrade059.py index 933e4e7..9cd9f1f 100644 --- a/pactest/tests/upgrade059.py +++ b/pactest/tests/upgrade059.py @@ -6,12 +6,10 @@ self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2", "1.0-1") lp2.provides = ["imaginary"] -lp2.requiredby = [ "pkg1" ] self.addpkg2db("local", lp2) lp3 = pmpkg("pkg3", "1.0-1") lp3.provides = ["imaginary"] -lp3.requiredby = [ "pkg1" ] self.addpkg2db("local", lp3) p2 = pmpkg("pkg2", "1.0-2") diff --git a/pactest/tests/upgrade060.py b/pactest/tests/upgrade060.py index dd78bba..7a28f3e 100644 --- a/pactest/tests/upgrade060.py +++ b/pactest/tests/upgrade060.py @@ -5,7 +5,6 @@ lp1.depends = ["pkg2=1.0"] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2", "1.0-1") -lp2.requiredby = [ "pkg1" ] self.addpkg2db("local", lp2) p1 = pmpkg("pkg1", "1.1-1") diff --git a/pactest/tests/upgrade061.py b/pactest/tests/upgrade061.py index 0b1ed4e..310e504 100644 --- a/pactest/tests/upgrade061.py +++ b/pactest/tests/upgrade061.py @@ -5,7 +5,6 @@ lp1.depends = ["imaginary"] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2", "1.0-1") -lp2.requiredby = [ "pkg1" ] lp2.provides = ["imaginary"] self.addpkg2db("local", lp2) diff --git a/pactest/tests/upgrade073.py b/pactest/tests/upgrade073.py index 3486c41..752a233 100644 --- a/pactest/tests/upgrade073.py +++ b/pactest/tests/upgrade073.py @@ -21,8 +21,6 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-2") self.addrule("PKG_DEPENDS=dummy|dep1") self.addrule("PKG_DEPENDS=dep1|dep2") -self.addrule("PKG_REQUIREDBY=dep1|dummy") -self.addrule("PKG_REQUIREDBY=dep2|dep1") for p in p1, p2, p3: self.addrule("PKG_EXIST=%s" % p.name) for f in p.files: diff --git a/pactest/tests/upgrade076.py b/pactest/tests/upgrade076.py new file mode 100644 index 0000000..87ccbdd --- /dev/null +++ b/pactest/tests/upgrade076.py @@ -0,0 +1,18 @@ +self.description = "Package downgrade (failure)" + +lp1 = pmpkg("pkg1") +lp1.depends = ["pkg2=1.1"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2", "1.1-1") +self.addpkg2db("local", lp2) + +p = pmpkg("pkg2", "1.0-1") +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") +self.addrule("PKG_VERSION=pkg2|1.1-1") -- 1.5.6.1

1 0

[pacman-dev] [PATCH] New _alpm_find_dep_satisfier function
by Nagy Gabor 04 Jul '08

04 Jul '08

From d199269813180d4a034fea54d025280aef3e4853 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 4 Jul 2008 15:39:26 +0200 Subject: [PATCH] New _alpm_find_dep_satisfier function This function finds the first satisfier package in a pkglist. Using it instead of _alpm_find_dep_satisfiers eliminates some memleaks and it is faster. (_alpm_find_dep_satisfiers and _alpm_find_pkg_satisfiers will be removed soon.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/deps.c | 25 +++++++++++++++++++------ lib/libalpm/deps.h | 1 + 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 410e22d..e67b008 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -189,6 +189,19 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse) return(newtargs); } +pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep) +{ + alpm_list_t *i; + + for(i = pkgs; i; i = alpm_list_next(i)) { + pmpkg_t *pkg = i->data; + if(alpm_depcmp(pkg, dep)) { + return(pkg); + } + } + return(NULL); +} + alpm_list_t *_alpm_find_dep_satisfiers(alpm_list_t *pkgs, pmdepend_t *dep) { alpm_list_t *i, *ret = NULL; @@ -232,7 +245,7 @@ alpm_list_t SYMEXPORT *alpm_deptest(pmdb_t *db, alpm_list_t *targets) target = alpm_list_getdata(i); dep = _alpm_splitdep(target); - if(!_alpm_find_dep_satisfiers(_alpm_db_get_pkgcache(db), dep)) { + if(!_alpm_find_dep_satisfier(_alpm_db_get_pkgcache(db), dep)) { ret = alpm_list_add(ret, target); } _alpm_dep_free(dep); @@ -283,8 +296,8 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps, pmdepend_t *depend = j->data; /* 1. we check the upgrade list */ /* 2. we check database for untouched satisfying packages */ - if(!_alpm_find_dep_satisfiers(upgrade, depend) && - !_alpm_find_dep_satisfiers(dblist, depend)) { + if(!_alpm_find_dep_satisfier(upgrade, depend) && + !_alpm_find_dep_satisfier(dblist, depend)) { /* Unsatisfied dependency in the upgrade list */ char *missdepstring = alpm_dep_get_string(depend); _alpm_log(PM_LOG_DEBUG, "checkdeps: missing dependency '%s' for package '%s'\n", @@ -303,13 +316,13 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps, pmpkg_t *lp = i->data; for(j = alpm_pkg_get_depends(lp); j; j = j->next) { pmdepend_t *depend = j->data; - pmpkg_t *causingpkg = alpm_list_getdata(_alpm_find_dep_satisfiers(modified, depend)); + pmpkg_t *causingpkg = _alpm_find_dep_satisfier(modified, depend); /* we won't break this depend, if it is already broken, we ignore it */ /* 1. check upgrade list for satisfiers */ /* 2. check dblist for satisfiers */ if(causingpkg && - !_alpm_find_dep_satisfiers(upgrade, depend) && - !_alpm_find_dep_satisfiers(dblist, depend)) { + !_alpm_find_dep_satisfier(upgrade, depend) && + !_alpm_find_dep_satisfier(dblist, depend)) { char *missdepstring = alpm_dep_get_string(depend); _alpm_log(PM_LOG_DEBUG, "checkdeps: transaction would break '%s' dependency of '%s'\n", missdepstring, alpm_pkg_get_name(lp)); diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 7bf178d..1e539b7 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -52,6 +52,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, **data); int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2); pmdepend_t *_alpm_splitdep(const char *depstring); +pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep); alpm_list_t *_alpm_find_dep_satisfiers(alpm_list_t *pkgs, pmdepend_t *dep); #endif /* _ALPM_DEPS_H */ -- 1.5.6.1

1 0

[pacman-dev] [PATCH] Fix a bogus message in Hungarian translation (maint)
by Nagy Gabor 04 Jul '08

04 Jul '08

From 4d8c96d44b70ed4e89449d72641239ffaf2226c0 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 4 Jul 2008 19:34:55 +0200 Subject: [PATCH] Fix a bogus message in Hungarian translation (maint) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/po/hu.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index c9fd870..9039146 100644 --- a/lib/libalpm/po/hu.po +++ b/lib/libalpm/po/hu.po @@ -139,7 +139,7 @@ msgstr "a(z) %s csomag saját %s függősége előtt lesz telepítve\n" #, c-format msgid "cannot resolve \"%s\", a dependency of \"%s\"\n" -msgstr "nem sikerült a(z) \"%s\" csomag \"%s\" függőségét feloldani\n" +msgstr "nem sikerült a(z) \"%2$s\" csomag \"%1$s\" függőségét feloldani\n" #, c-format msgid "out of memory!" -- 1.5.6.1

1 0

[pacman-dev] Pending 3.2 release thread
by Dan McGee 03 Jul '08

03 Jul '08

This thread is meant for discussion about the upcoming 3.2 release which I would like to do in the next two to three weeks. It has been a while since a major release and I think we should get one out the door. At this point I think we can say there should be no large-scale feature addition before the release, and I would encourage you to heavily use and test the current master git branch on your system to ensure we aren't letting anything slip by we shouldn't. I updated pacman-git tonight in my repository for i686. I will try to get an x86_64 build updated sometime as well. Nagy has mentioned that FS#8905 should get looked at before the release, and I tend to agree, although I am not sure how to proceed with this. Please let me know what you guys think, and if we have any pending patches outstanding to fix this issue please resubmit. If you feel an outstanding bug should be a blocker, speak now or never. We will need one week for translation requests and updates to be submitted, so we can continue to do some small-scale fixes at that point if they don't affect strings. On-topic thoughts/comments/questions are welcome. -Dan

4 5

Re: [pacman-dev] [PATCH] Modify bacman to use .pkg.tar.gz suffix
by Carlo Bersani 02 Jul '08

02 Jul '08

We take the extension of the target package from makepkg.conf Hope this works, thank you all for the git cheat sheet Signed-off-by: Carlo Bersani <carlocci(a)gmail.com> --- contrib/bacman | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/bacman b/contrib/bacman index 410482f..063fdd7 100755 --- a/contrib/bacman +++ b/contrib/bacman @@ -88,6 +88,7 @@ fi pkg_arch=${CARCH:-'unknown'} pkg_dest="${PKGDEST:-$PWD}" pkg_pkger=${PACKAGER:-'Unknown Packager'} +pkg_ext=${PKGEXT:-'.pkg.tar.gz'} pkg_name="$1" pkg_dir="$(echo $pac_db/$pkg_name-[0-9]*)" @@ -265,7 +266,7 @@ chmod 644 $work_dir/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null echo "Generating the package..." ret=0 -bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch.tar.gz" $(ls -A) || ret=$? +bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch$pkg_ext" $(ls -A) || ret=$? if [ $ret -ne 0 ]; then echo "ERROR: unable to write package to $pkg_dest" echo " Maybe the disk is full or you do not have write access" @@ -279,4 +280,4 @@ echo Done exit 0 -# vim: set ts=2 sw=2 noet: \ No newline at end of file +# vim: set ts=2 sw=2 noet: -- 1.5.6.1

1 0

[pacman-dev] Status of _alpm_find_first_satisfier?
by Nagy Gabor 02 Jul '08

02 Jul '08

Hi! I would like to ask you about this patch: http://shining.toofishes.net/gitweb/gitweb.cgi?p=pacman.git;a=commit;h=aae0… * I'd like to refactor resolvedeps, and this function would be useful there. (I think *list param can be input/output list of resolvedeps like in recursedeps (and kill syncpkg param), and "find_literal" "find_othersatisfier" parts can be moved to its own function and used by front-end too...) * Xavier says that this patch "Address two concerns". One of them is the memleak caused by current _alpm_find_dep_satisfiers usage (which returns with a list, but we don't free it), which needs to be fixed even if this patch will be rejected. I think that _alpm_find_first_satisfier implementation is a bit complicated... I would prefer just ~reimplement _alpm_find_dep_satisfiers instead of calling it (and introducing a new "wrapper"). Bye

2 5

[pacman-dev] [PATCH] Modify bacman to use .pkg.tar.gz suffix
by Nagy Gabor 02 Jul '08

02 Jul '08

From a566684aeab88d9e983c5a57ee7c7ecbf775e478 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 1 Jul 2008 18:39:04 +0200 Subject: [PATCH] Modify bacman to use .pkg.tar.gz suffix The old one created foo-1.0-1.tar.gz named package file. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- contrib/bacman | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/bacman b/contrib/bacman index 410482f..a973823 100755 --- a/contrib/bacman +++ b/contrib/bacman @@ -265,7 +265,7 @@ chmod 644 $work_dir/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null echo "Generating the package..." ret=0 -bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch.tar.gz" $(ls -A) || ret=$? +bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch.pkg.tar.gz" $(ls -A) || ret=$? if [ $ret -ne 0 ]; then echo "ERROR: unable to write package to $pkg_dest" echo " Maybe the disk is full or you do not have write access" -- 1.5.6.1

3 3

[pacman-dev] New _alpm_dep_edge function
by Nagy Gabor 01 Jul '08

01 Jul '08

From cfe1de25873cf7d3d51a33682286f70e53733c4d Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 1 Jul 2008 22:53:13 +0200 Subject: [PATCH] New _alpm_dep_edge function The function is introduced to kill some code duplication. The funcion name uses the 'dependency graph' terminology. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/deps.c | 54 +++++++++++++++++++++++------------------------- lib/libalpm/deps.h | 1 + lib/libalpm/package.c | 16 +++---------- 3 files changed, 31 insertions(+), 40 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 37e9916..bad2587 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -74,7 +74,7 @@ void _alpm_depmiss_free(pmdepmissing_t *miss) */ static alpm_list_t *dep_graph_init(alpm_list_t *targets) { - alpm_list_t *i, *j, *k; + alpm_list_t *i, *j; alpm_list_t *vertices = NULL; /* We create the vertices */ for(i = targets; i; i = i->next) { @@ -91,12 +91,7 @@ static alpm_list_t *dep_graph_init(alpm_list_t *targets) for(j = vertices; j; j = j->next) { pmgraph_t *vertex_j = j->data; pmpkg_t *p_j = vertex_j->data; - int child = 0; - for(k = alpm_pkg_get_depends(p_i); k && !child; k = k->next) { - pmdepend_t *depend = k->data; - child = alpm_depcmp(p_j, depend); - } - if(child) { + if(_alpm_dep_edge(p_i, p_j)) { vertex_i->children = alpm_list_add(vertex_i->children, vertex_j); } @@ -458,7 +453,7 @@ pmdepend_t *_alpm_dep_dup(const pmdepend_t *dep) static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets, int include_explicit) { - alpm_list_t *i, *j; + alpm_list_t *i; if(_alpm_pkg_find(targets, alpm_pkg_get_name(pkg))) { return(0); @@ -482,13 +477,8 @@ static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets, /* see if other packages need it */ for(i = _alpm_db_get_pkgcache(db); i; i = i->next) { pmpkg_t *lpkg = i->data; - for(j = alpm_pkg_get_depends(lpkg); j; j = j->next) { - if(alpm_depcmp(pkg, j->data)) { - if(!_alpm_pkg_find(targets, lpkg->name)) { - return(0); - } - break; - } + if(_alpm_dep_edge(lpkg, pkg) && !_alpm_pkg_find(targets, lpkg->name)) { + return(0); } } @@ -508,7 +498,7 @@ static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets, */ void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit) { - alpm_list_t *i, *j, *k; + alpm_list_t *i, *j; ALPM_LOG_FUNC; @@ -518,18 +508,14 @@ void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit) for(i = targs; i; i = i->next) { pmpkg_t *pkg = i->data; - for(j = alpm_pkg_get_depends(pkg); j; j = j->next) { - pmdepend_t *depend = j->data; - - for(k = _alpm_db_get_pkgcache(db); k; k = k->next) { - pmpkg_t *deppkg = k->data; - if(alpm_depcmp(deppkg,depend) - && can_remove_package(db, deppkg, targs, include_explicit)) { - _alpm_log(PM_LOG_DEBUG, "adding '%s' to the targets\n", - alpm_pkg_get_name(deppkg)); - /* add it to the target list */ - targs = alpm_list_add(targs, _alpm_pkg_dup(deppkg)); - } + for(j = _alpm_db_get_pkgcache(db); j; j = j->next) { + pmpkg_t *deppkg = j->data; + if(_alpm_dep_edge(pkg, deppkg) + && can_remove_package(db, deppkg, targs, include_explicit)) { + _alpm_log(PM_LOG_DEBUG, "adding '%s' to the targets\n", + alpm_pkg_get_name(deppkg)); + /* add it to the target list */ + targs = alpm_list_add(targs, _alpm_pkg_dup(deppkg)); } } } @@ -668,6 +654,18 @@ error: return(-1); } +/* Does pkg1 depend on pkg2, ie. does pkg2 satisfy a dependency of pkg1? */ +int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2) +{ + alpm_list_t *i; + for(i = alpm_pkg_get_depends(pkg1); i; i = i->next) { + if(alpm_depcmp(pkg2, i->data)) { + return(1); + } + } + return(0); +} + const char SYMEXPORT *alpm_miss_get_target(const pmdepmissing_t *miss) { ALPM_LOG_FUNC; diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 70badfd..7bf178d 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -50,6 +50,7 @@ void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit); int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, alpm_list_t **list, alpm_list_t *remove, pmtrans_t *trans, alpm_list_t **data); +int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2); pmdepend_t *_alpm_splitdep(const char *depstring); alpm_list_t *_alpm_find_dep_satisfiers(alpm_list_t *pkgs, pmdepend_t *dep); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 79cc64e..56bd328 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -540,7 +540,7 @@ unsigned short SYMEXPORT alpm_pkg_has_scriptlet(pmpkg_t *pkg) */ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg) { - const alpm_list_t *i, *j; + const alpm_list_t *i; alpm_list_t *reqs = NULL; pmdb_t *localdb = alpm_option_get_localdb(); @@ -549,17 +549,9 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg) continue; } pmpkg_t *cachepkg = i->data; - const char *cachepkgname = alpm_pkg_get_name(cachepkg); - - for(j = alpm_pkg_get_depends(cachepkg); j; j = j->next) { - pmdepend_t *dep = j->data; - - if(alpm_depcmp(pkg, dep)) { - _alpm_log(PM_LOG_DEBUG, "adding '%s' in requiredby field for '%s'\n", - cachepkgname, pkg->name); - reqs = alpm_list_add(reqs, strdup(cachepkgname)); - break; - } + if(_alpm_dep_edge(cachepkg, pkg)) { + const char *cachepkgname = alpm_pkg_get_name(cachepkg); + reqs = alpm_list_add(reqs, strdup(cachepkgname)); } } return(reqs); -- 1.5.6.1

1 0