- Pacman-dev - lists.archlinux.org

[pacman-dev] makepkg-git package
by Allan McRae 17 Jan '09

17 Jan '09

Hi all, The splitpkg work has now made it into pacman's master branch so it would be good to get some more testing on this. I have made a makepkg-git package that installs alongside the makepkg from pacman so people can safely take this for a spin. Read all about it and download from http://dev.archlinux.org/~allan/makepkg-git.html Just a reminder for those who want to test new features in pacman and makepkg, Dan has pacman-git build that can be tried out. Dan uses these builds all the time, so the are fairly stable... He pushed a package today so they will only be 1 patch different to my makepkg-git package. x86:64: [pacman-git-64] Server = http://dev.archlinux.org/~dan/pacman-git i686: [pacman-git] Server = http://dev.archlinux.org/~dan/pacman-git Allan

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-69-gfba5771
by dan＠archlinux.org 17 Jan '09

17 Jan '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via fba5771fa4c774457531a4bbbcd66340c7c3fb6a (commit) via 5bc23bc05d1661b27867a53069858c05356efd22 (commit) from 3d49d88009341d5cacbbe08fb4f6f6af3ed76ae1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fba5771fa4c774457531a4bbbcd66340c7c3fb6a Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 17 16:41:01 2009 +1000 makepkg: repackage rework with package functions When using the optional package() function or split packages, the entire packaging step is rerun instead of just final package creation step. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5bc23bc05d1661b27867a53069858c05356efd22 Author: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> Date: Sat Jan 17 15:14:16 2009 +1300 Fixed some inconsistencies and errors in the pactest documentation. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: pactest/README | 25 ++++++++++++++++--------- scripts/makepkg.sh.in | 48 ++++++++++++++++++++++++++++-------------------- 2 files changed, 44 insertions(+), 29 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: repackage rework with package functions
by Allan McRae 17 Jan '09

17 Jan '09

When using the optional package() function or split packages, the entire packaging step is rerun instead of just final package creation step. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 47 +++++++++++++++++++++++++++-------------------- 1 files changed, 27 insertions(+), 20 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1e990de..6bff50f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -67,6 +67,7 @@ LOGGING=0 SOURCEONLY=0 IGNOREARCH=0 HOLDVER=0 +PKGFUNC=0 SPLITPKG=0 # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call @@ -1526,8 +1527,7 @@ else fi # check for sudo if we will need it during makepkg execution -if [ "$ASROOT" = "0" -a $ "$DEP_BIN" = "1" \ - -o "$RMDEPS" = "1" -o "$INSTALL" = "1" $ ]; then +if [ "$ASROOT" = "0" -a $ "$DEP_BIN" = "1" -o "$RMDEPS" = "1" -o "$INSTALL" = "1" $ ]; then if [ ! "$(type -p sudo)" ]; then error "$(gettext "Cannot find the sudo binary! Is sudo installed?")" plain "$(gettext "Missing dependencies cannot be installed or removed as a normal user")" @@ -1566,6 +1566,10 @@ if [ "$GENINTEG" = "1" ]; then exit 0 # $E_OK fi +if [ "$(type -t package)" == "function" ]; then + PKGFUNC=1 +fi + if [ "${#pkgname[@]}" -gt "1" ]; then SPLITPKG=1 fi @@ -1659,12 +1663,12 @@ fi # Run the bare minimum in fakeroot if [ "$INFAKEROOT" = "1" ]; then if [ "$SPLITPKG" = "0" ]; then - if [ "$REPKG" = "0" ]; then - if [ "$(type -t package)" != "function" ]; then + if [ "$PKGFUNC" = "0" ]; then + if [ "$REPKG" = "0" ]; then run_build - else - run_package fi + else + run_package tidy_install fi create_package @@ -1740,10 +1744,13 @@ if [ "$NOEXTRACT" = "1" ]; then plain "$(gettext "Aborting...")" exit 1 fi -elif [ "$REPKG" = "1" -a $ ! -d "$pkgdir" -o "$(ls "$pkgdir" 2>/dev/null)" = "" $ ]; then - error "$(gettext "The package directory is empty, there is nothing to repackage!")" - plain "$(gettext "Aborting...")" - exit 1 +elif [ "$REPKG" = "1" ]; then + if [ "$PKGFUNC" = "0" -a "$SPLITPKG" = "0" \ + -a $ ! -d "$pkgdir" -o "$(ls "$pkgdir" 2>/dev/null)" = "" $ ]; then + error "$(gettext "The package directory is empty, there is nothing to repackage!")" + plain "$(gettext "Aborting...")" + exit 1 + fi else download_sources check_checksums @@ -1755,7 +1762,7 @@ if [ "$NOBUILD" = "1" ]; then exit 0 #E_OK else # check for existing pkg directory; don't remove if we are repackaging - if [ -d "$pkgdir" -a "$REPKG" = "0" ]; then + if [ -d "$pkgdir" -a $ "$REPKG" = "0" -o "$PKGFUNC" = "1" -o "$SPLITPKG" = "1" $ ]; then msg "$(gettext "Removing existing pkg/ directory...")" rm -rf "$pkgdir" fi @@ -1764,19 +1771,19 @@ else # if we are root or if fakeroot is not enabled, then we don't use it if [ "$(check_buildenv fakeroot)" != "y" -o $EUID -eq 0 ]; then + if [ "$REPKG" = "0" ]; then + devel_update + run_build + fi if [ "$SPLITPKG" = "0" ]; then - if [ "$REPKG" = "0" ]; then - devel_update - run_build - if [ "$(type -t package)" == "function" ]; then - run_package - fi + if [ "$PKGFUNC" = "1" ]; then + run_package + tidy_install + elif [ "$REPKG" = "0" ]; then tidy_install fi create_package else - devel_update - run_build for pkg in ${pkgname[@]}; do pkgdir="$pkgdir/$pkg" mkdir -p "$pkgdir" @@ -1789,7 +1796,7 @@ else done fi else - if [ "$(type -t package)" == "function" -o "$SPLITPKG" = "1" ]; then + if [ "$REPKG" = "0" -a $ "$PKGFUNC" == "1" -o "$SPLITPKG" = "1" $ ]; then devel_update run_build cd "$startdir" -- 1.6.1

2 1

[pacman-dev] makepkg-git package
by Allan McRae 17 Jan '09

17 Jan '09

Hi all, The splitpkg work has now made it into pacman's master branch so it would be good to get some more testing on this. I have made a makepkg-git package that installs alongside the makepkg from pacman so people can safely take this for a spin. Read all about it and download from http://dev.archlinux.org/~allan/makepkg-git.html Just a reminder for those who want to test new features in pacman and makepkg, Dan has pacman-git build that can be tried out. Dan uses these builds all the time, so the are fairly stable... He pushed a package today so they will only be 1 patch different to my makepkg-git package. x86:64: [pacman-git-64] Server = http://dev.archlinux.org/~dan/pacman-git i686: [pacman-git] Server = http://dev.archlinux.org/~dan/pacman-git Allan

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-67-g3d49d88
by dan＠archlinux.org 17 Jan '09

17 Jan '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 3d49d88009341d5cacbbe08fb4f6f6af3ed76ae1 (commit) via e946ee7745a839c0cd9244a3d9b50a3ea15143f9 (commit) via 21b8a5418dc4e4f0b0ebc95b20126c07b3714ca6 (commit) via 708ce1480f83e01af7a6aba2db04e7982c313673 (commit) via 9804911c5fbe7363d22f2384953bbcc3e57c1959 (commit) via 08034ceb1767f4bcbb7b440bcbfed1bc76881d16 (commit) via 219cb2eaacf1ff35bd04cd64d0f8b616a732e185 (commit) via a9f030e84c96d57fbcbc7e8af5fc897515ef79e7 (commit) from 7a3a718c7af493049cf7f9b7c65032f59cc8a71d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3d49d88009341d5cacbbe08fb4f6f6af3ed76ae1 Merge: a9f030e84c96d57fbcbc7e8af5fc897515ef79e7 e946ee7745a839c0cd9244a3d9b50a3ea15143f9 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 16 19:45:02 2009 -0600 Merge branch 'am/splitpkg' * am/splitpkg: makepkg: implement creation of split packages makepkg: Optional argument for run_package and create_package makepkg: hack around tee in run_package function makepkg: add functions for backup and restore of package fields makepkg: add optional package function makepkg: Add PKGBUILD-split.proto commit e946ee7745a839c0cd9244a3d9b50a3ea15143f9 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 16 22:32:05 2009 +1000 makepkg: implement creation of split packages Adds the ability to create multiple packages from one PKGBUILD Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 21b8a5418dc4e4f0b0ebc95b20126c07b3714ca6 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 16 22:26:52 2009 +1000 makepkg: Optional argument for run_package and create_package Generalize run_package to allow the passing of a package name directing the use of an alternative package function. A similar adjustment to create_package to prepare split packages. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 708ce1480f83e01af7a6aba2db04e7982c313673 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 8 12:21:03 2008 +1000 makepkg: hack around tee in run_package function Piping the package function through tee to log the outut also clears any variables set in the package function. This is a problem in split packages as package variable overrides are done in the package function. This is fixed by creating a node which the output is piped through and duplicated using the tee function. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9804911c5fbe7363d22f2384953bbcc3e57c1959 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 16 22:22:04 2009 +1000 makepkg: add functions for backup and restore of package fields Adds functions for the backup and restoration of package variables that can be over-ridden during package splitting. Variables which can be overridden are given in the splitpkg_overrides variable. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 08034ceb1767f4bcbb7b440bcbfed1bc76881d16 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 16 22:20:05 2009 +1000 makepkg: add optional package function This patch allows us to split the building and packaging stages of a PKGBUILD and minimize fakeroot usage. This can be done with less code duplication (run_build and run_package look quite similiar) but the run_package function will be where the package splitting logic is implemented in the future. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 219cb2eaacf1ff35bd04cd64d0f8b616a732e185 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 16 22:16:18 2009 +1000 makepkg: Add PKGBUILD-split.proto Prototype PKGBUILD for package splitting in makepkg Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a9f030e84c96d57fbcbc7e8af5fc897515ef79e7 Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Fri Dec 12 00:02:19 2008 -0600 Make the repo-add quiet flag less quiet Considering one can easily run: repo-add .... >/dev/null to get only warnings and errors, the -q flag is mostly useless. Make the -q flag silence only level 2 messages. Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 +- PKGBUILD-split.proto | 55 +++++++++++++++++ doc/PKGBUILD.5.txt | 8 +++ scripts/makepkg.sh.in | 154 ++++++++++++++++++++++++++++++++++++++++++++---- scripts/repo-add.sh.in | 5 +- 5 files changed, 207 insertions(+), 17 deletions(-) create mode 100644 PKGBUILD-split.proto hooks/post-receive -- The official pacman repository

4 3

[pacman-dev] My git send-email patches
by Bryan Ischo 17 Jan '09

17 Jan '09

Hopefully these will be in the correct format. I tested the resulting emails by first sending them to myself and then using git am to apply them and all was fine (except for a warning or two about whitespace at the end of lines, which I assume is not a big deal. PLEASE don't tell me I have to reformat my patches to get rid of a little tiny bit of harmless whitespace!). I'm still learning git and the whole source-control-as-patches-flying-around workflow and I know I'm making lots of mistakes, but I am sorry!

2 5

[pacman-dev] [PATCH 4/4] Fixed some inconsistencies and errors in the pactest documentation.
by Bryan Ischo 17 Jan '09

17 Jan '09

Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- pactest/README | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/pactest/README b/pactest/README index 5d4e47f..8f97a17 100644 --- a/pactest/README +++ b/pactest/README @@ -70,12 +70,12 @@ Usage pactest will run the suite of tests defined by the "--test" parameter. Example: - ./pactest.py --test=test/* + ./pactest.py --test tests/*.py -This example will run tests from the "test" directory. +This example will run all tests from the "tests" directory. Note: several "--test" options can be passed to pactest. -Use the ""help" option to get the full list of parameters: +Use the "help" option to get the full list of parameters: ./pactest.py --help @@ -103,15 +103,22 @@ Example: ------ A dictionary that holds the data used in the pacman configuration file. -It has 3 keys, each one of them pointing at a list of strings: - - noupgrade - - noextract - - ignorepkg +The following options are known to be useful in pactest tests; this list +is not necessarily complete: + - HoldPkg + - IgnorePkg + - IgnoreGroup + - SyncFirst + - NoExtract + - NoUpgrade + - XferCommand + +For documentation on these options, see the pacman.conf documentation. Examples: - self.option["noupgrade"] = ["etc/X11/xorg.conf", + self.option["NoUpgrade"] = ["etc/X11/xorg.conf", "etc/pacman.conf"] - self.option["noextract"] = ["etc/lilo.conf"] + self.option["NoExtract"] = ["etc/lilo.conf"] filesystem ----------

2 1

[pacman-dev] [PATCH 3/4] Don't prompt the user for unignore of IgnorePkg/IgnoreGroup packages except for packages explicitly listed for sync by the user.
by Bryan Ischo 17 Jan '09

17 Jan '09

This eliminates many unnecessary prompts when IgnorePkg/IgnoreGroup is used. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- lib/libalpm/deps.c | 20 +++++++++++------- lib/libalpm/deps.h | 2 +- lib/libalpm/sync.c | 4 +- pactest/tests/ignore001.py | 17 ++++++++++++++++ pactest/tests/ignore002.py | 35 +++++++++++++++++++++++++++++++++ pactest/tests/ignore003.py | 35 +++++++++++++++++++++++++++++++++ pactest/tests/ignore004.py | 46 ++++++++++++++++++++++++++++++++++++++++++++ pactest/tests/ignore005.py | 46 ++++++++++++++++++++++++++++++++++++++++++++ src/pacman/callback.c | 11 +-------- 9 files changed, 196 insertions(+), 20 deletions(-) create mode 100644 pactest/tests/ignore001.py create mode 100644 pactest/tests/ignore002.py create mode 100644 pactest/tests/ignore003.py create mode 100644 pactest/tests/ignore004.py create mode 100644 pactest/tests/ignore005.py diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 41eedaa..fa9da7a 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -505,7 +505,7 @@ void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit) } /* helper function for resolvedeps: search for dep satisfier in dbs */ -pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, pmpkg_t *tpkg) +pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, int prompt_for_unignore) { alpm_list_t *i, *j; /* 1. literals */ @@ -513,9 +513,11 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *exclud pmpkg_t *pkg = _alpm_db_get_pkgfromcache(i->data, dep->name); if(pkg && alpm_depcmp(pkg, dep) && !_alpm_pkg_find(excluding, pkg->name)) { if(_alpm_pkg_should_ignore(pkg)) { - int install; - QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg, - tpkg, NULL, &install); + int install = 0; + if (prompt_for_unignore) { + QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg, + NULL, NULL, &install); + } if(!install) { continue; } @@ -530,9 +532,11 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *exclud if(alpm_depcmp(pkg, dep) && strcmp(pkg->name, dep->name) && !_alpm_pkg_find(excluding, pkg->name)) { if(_alpm_pkg_should_ignore(pkg)) { - int install; - QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg, - tpkg, NULL, &install); + int install = 0; + if (prompt_for_unignore) { + QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg, + NULL, NULL, &install); + } if(!install) { continue; } @@ -607,7 +611,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, continue; } /* find a satisfier package in the given repositories */ - pmpkg_t *spkg = _alpm_resolvedep(missdep, dbs_sync, *packages, tpkg); + pmpkg_t *spkg = _alpm_resolvedep(missdep, dbs_sync, *packages, 0); if(!spkg) { pm_errno = PM_ERR_UNSATISFIED_DEPS; char *missdepstring = alpm_dep_compute_string(missdep); diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 9dca91d..8983cef 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -47,7 +47,7 @@ pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdepend_t *dep, void _alpm_depmiss_free(pmdepmissing_t *miss); alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse); void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit); -pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, pmpkg_t *tpkg); +pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, int prompt_for_unignore); int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, alpm_list_t **packages, alpm_list_t *remove, alpm_list_t **data); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index b3945fc..5604880 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -285,12 +285,12 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy RET_ERR(PM_ERR_PKG_REPO_NOT_FOUND, -1); } dep = _alpm_splitdep(targ); - spkg = _alpm_resolvedep(dep, dbs, NULL, NULL); + spkg = _alpm_resolvedep(dep, dbs, NULL, 1); _alpm_dep_free(dep); alpm_list_free(dbs); } else { dep = _alpm_splitdep(targline); - spkg = _alpm_resolvedep(dep, dbs_sync, NULL, NULL); + spkg = _alpm_resolvedep(dep, dbs_sync, NULL, 1); _alpm_dep_free(dep); } FREE(targline); diff --git a/pactest/tests/ignore001.py b/pactest/tests/ignore001.py new file mode 100644 index 0000000..bf8e8c6 --- /dev/null +++ b/pactest/tests/ignore001.py @@ -0,0 +1,17 @@ +self.description = "Sync with irrelevent ignored packages" + +package1 = pmpkg("package1") +self.addpkg2db("local", package1) + +package2 = pmpkg("package2") +self.addpkg2db("local", package2) + +package2up = pmpkg("package2", "2.0-1") +self.addpkg2db("sync", package2up) + +self.option["IgnorePkg"] = ["irrelevent"] +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=package1|1.0-1") +self.addrule("PKG_VERSION=package2|2.0-1") diff --git a/pactest/tests/ignore002.py b/pactest/tests/ignore002.py new file mode 100644 index 0000000..b64b70a --- /dev/null +++ b/pactest/tests/ignore002.py @@ -0,0 +1,35 @@ +self.description = "Sync with relevent ignored packages" + +package1 = pmpkg("package1") +self.addpkg2db("local", package1) + +package2 = pmpkg("package2") +self.addpkg2db("local", package2) + +package3 = pmpkg("package3") +package3.depends = ["package2=1.0-1"] +self.addpkg2db("local", package3) + +package4 = pmpkg("package4") +package4.depends = ["package3=1.0-1"] +self.addpkg2db("local", package4) + +package2up = pmpkg("package2", "2.0-1") +self.addpkg2db("sync", package2up) + +package3up = pmpkg("package3", "2.0-1") +package3up.depends = ["package2=2.0-1"] +self.addpkg2db("sync", package3up) + +package4up = pmpkg("package4", "2.0-1") +package4up.depends = ["package3=2.0-1"] +self.addpkg2db("sync", package4up) + +self.option["IgnorePkg"] = ["package2"] +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=package1|1.0-1") +self.addrule("PKG_VERSION=package2|1.0-1") +self.addrule("PKG_VERSION=package3|1.0-1") +self.addrule("PKG_VERSION=package4|1.0-1") diff --git a/pactest/tests/ignore003.py b/pactest/tests/ignore003.py new file mode 100644 index 0000000..f7c1658 --- /dev/null +++ b/pactest/tests/ignore003.py @@ -0,0 +1,35 @@ +self.description = "Sync with relevent ignored packages and dependency loop" + +package1 = pmpkg("package1") +self.addpkg2db("local", package1) + +package2 = pmpkg("package2") +self.addpkg2db("local", package2) + +package3 = pmpkg("package3") +package3.depends = ["package2=1.0-1"] +self.addpkg2db("local", package3) + +package4 = pmpkg("package4") +package4.depends = ["package3=1.0-1"] +self.addpkg2db("local", package4) + +package2up = pmpkg("package2", "2.0-1") +self.addpkg2db("sync", package2up) + +package3up = pmpkg("package3", "2.0-1") +package3up.depends = ["package2=2.0-1", "package4=2.0-1"] +self.addpkg2db("sync", package3up) + +package4up = pmpkg("package4", "2.0-1") +package4up.depends = ["package3=2.0-1"] +self.addpkg2db("sync", package4up) + +self.option["IgnorePkg"] = ["package2"] +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=package1|1.0-1") +self.addrule("PKG_VERSION=package2|1.0-1") +self.addrule("PKG_VERSION=package3|1.0-1") +self.addrule("PKG_VERSION=package4|1.0-1") diff --git a/pactest/tests/ignore004.py b/pactest/tests/ignore004.py new file mode 100644 index 0000000..fff12f6 --- /dev/null +++ b/pactest/tests/ignore004.py @@ -0,0 +1,46 @@ +self.description = "Sync with ignore causing top-level to be ignored" + +packageA1 = pmpkg("packageA1") +packageA1.depends = ["packageA2=1.0-1", "packageA3=1.0-1"]; +self.addpkg2db("local", packageA1) + +packageA2 = pmpkg("packageA2") +packageA2.depends = ["packageA4=1.0-1", "packageA5=1.0-1"]; +self.addpkg2db("local", packageA2) + +packageA3 = pmpkg("packageA3") +self.addpkg2db("local", packageA3) + +packageA4 = pmpkg("packageA4") +self.addpkg2db("local", packageA4) + +packageA5 = pmpkg("packageA5") +self.addpkg2db("local", packageA5) + +packageA1up = pmpkg("packageA1", "2.0-1") +packageA1up.depends = ["packageA2=2.0-1", "packageA3=2.0-1"]; +self.addpkg2db("sync", packageA1up) + +packageA2up = pmpkg("packageA2", "2.0-1") +packageA2up.depends = ["packageA4=2.0-1", "packageA5=2.0-1"]; +self.addpkg2db("sync", packageA2up) + +packageA3up = pmpkg("packageA3", "2.0-1") +self.addpkg2db("sync", packageA3up) + +packageA4up = pmpkg("packageA4", "2.0-1") +self.addpkg2db("sync", packageA4up) + +packageA5up = pmpkg("packageA5", "2.0-1") +self.addpkg2db("sync", packageA5up) + + +self.option["IgnorePkg"] = ["packageA3"] +self.args = "-S packageA1" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=packageA1|1.0-1") +self.addrule("PKG_VERSION=packageA2|1.0-1") +self.addrule("PKG_VERSION=packageA3|1.0-1") +self.addrule("PKG_VERSION=packageA4|1.0-1") +self.addrule("PKG_VERSION=packageA5|1.0-1") diff --git a/pactest/tests/ignore005.py b/pactest/tests/ignore005.py new file mode 100644 index 0000000..1957ea4 --- /dev/null +++ b/pactest/tests/ignore005.py @@ -0,0 +1,46 @@ +self.description = "Sync with ignore causing top-level to be included" + +packageA1 = pmpkg("packageA1") +packageA1.depends = ["packageA2>=1.0-1", "packageA3=1.0-1"]; +self.addpkg2db("local", packageA1) + +packageA2 = pmpkg("packageA2") +packageA2.depends = ["packageA4=1.0-1", "packageA5=1.0-1"]; +self.addpkg2db("local", packageA2) + +packageA3 = pmpkg("packageA3") +self.addpkg2db("local", packageA3) + +packageA4 = pmpkg("packageA4") +self.addpkg2db("local", packageA4) + +packageA5 = pmpkg("packageA5") +self.addpkg2db("local", packageA5) + +packageA1up = pmpkg("packageA1", "2.0-1") +packageA1up.depends = ["packageA2>=2.0-1", "packageA3=2.0-1"]; +self.addpkg2db("sync", packageA1up) + +packageA2up = pmpkg("packageA2", "2.0-1") +packageA2up.depends = ["packageA4=2.0-1", "packageA5=2.0-1"]; +self.addpkg2db("sync", packageA2up) + +packageA3up = pmpkg("packageA3", "2.0-1") +self.addpkg2db("sync", packageA3up) + +packageA4up = pmpkg("packageA4", "2.0-1") +self.addpkg2db("sync", packageA4up) + +packageA5up = pmpkg("packageA5", "2.0-1") +self.addpkg2db("sync", packageA5up) + + +self.option["IgnorePkg"] = ["packageA3"] +self.args = "-S packageA1 packageA2" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=packageA1|1.0-1") +self.addrule("PKG_VERSION=packageA2|2.0-1") +self.addrule("PKG_VERSION=packageA3|1.0-1") +self.addrule("PKG_VERSION=packageA4|2.0-1") +self.addrule("PKG_VERSION=packageA5|2.0-1") diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 1e2bff3..65b5ab7 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -248,15 +248,8 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, { switch(event) { case PM_TRANS_CONV_INSTALL_IGNOREPKG: - if(data2) { - /* TODO we take this route based on data2 being not null? WTF */ - *response = yesno(_(":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"), - alpm_pkg_get_name(data2), - alpm_pkg_get_name(data1)); - } else { - *response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), - alpm_pkg_get_name(data1)); - } + *response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), + alpm_pkg_get_name(data1)); break; case PM_TRANS_CONV_REPLACE_PKG: *response = yesno(_(":: Replace %s with %s/%s?"),

1 0

[pacman-dev] [PATCH 2/4] Enabled a new prompt to ask the user if they'd like to remove unresolvable packages from the transaction rather than failing it.
by Bryan Ischo 17 Jan '09

17 Jan '09

Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- lib/libalpm/alpm.h | 3 ++- lib/libalpm/deps.c | 2 +- lib/libalpm/sync.c | 24 ++++++++++++++++++------ pactest/tests/provision020.py | 2 +- pactest/tests/provision022.py | 2 +- pactest/tests/sync1008.py | 2 +- pactest/tests/sync300.py | 2 +- src/pacman/callback.c | 25 +++++++++++++++++++++++++ 8 files changed, 50 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 7b7ca4e..3836d60 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -371,7 +371,8 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_REPLACE_PKG = 0x02, PM_TRANS_CONV_CONFLICT_PKG = 0x04, PM_TRANS_CONV_CORRUPTED_PKG = 0x08, - PM_TRANS_CONV_LOCAL_NEWER = 0x10 + PM_TRANS_CONV_LOCAL_NEWER = 0x10, + PM_TRANS_CONV_REMOVE_PKGS = 0x20, } pmtransconv_t; /* Transaction Progress */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index a5b57ad..41eedaa 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -611,7 +611,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, if(!spkg) { pm_errno = PM_ERR_UNSATISFIED_DEPS; char *missdepstring = alpm_dep_compute_string(missdep); - _alpm_log(PM_LOG_ERROR, _("cannot resolve \"%s\", a dependency of \"%s\"\n"), + _alpm_log(PM_LOG_WARNING, _("cannot resolve \"%s\", a dependency of \"%s\"\n"), missdepstring, tpkg->name); free(missdepstring); if(data) { diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 5daadbd..b3945fc 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -446,13 +446,25 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync dependencies not already on the list */ } - /* If there were unresolvable top-level packages, fail the - transaction. In a future checkin, the user will be asked if they'd - like to drop the unresolvable packages intead. */ + /* If there were unresolvable top-level packages, prompt the user to + see if they'd like to ignore them rather than failing the sync */ if(unresolvable != NULL) { - /* pm_errno is set by resolvedeps */ - ret = -1; - goto cleanup; + int remove_unresolvable = 0; + QUESTION(handle->trans, PM_TRANS_CONV_REMOVE_PKGS, unresolvable, NULL, NULL, &remove_unresolvable); + if (remove_unresolvable) { + /* User wants to remove the unresolvable packages from the + transaction, so simply drop the unresolvable list. The + packages will be removed from the actual transaction when + the transaction packages are replaced with a + dependency-reordered list below */ + alpm_list_free(unresolvable); + unresolvable = NULL; + } + else { + /* pm_errno is set by resolvedeps */ + ret = -1; + goto cleanup; + } } /* Add all packages which were "pulled" (i.e. weren't already in the diff --git a/pactest/tests/provision020.py b/pactest/tests/provision020.py index 7cb0a01..c9c0ac3 100644 --- a/pactest/tests/provision020.py +++ b/pactest/tests/provision020.py @@ -10,6 +10,6 @@ self.args = "-S %s" % p.name -self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") diff --git a/pactest/tests/provision022.py b/pactest/tests/provision022.py index 4883d42..190a8b6 100644 --- a/pactest/tests/provision022.py +++ b/pactest/tests/provision022.py @@ -10,6 +10,6 @@ self.args = "-S %s" % p.name -self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") diff --git a/pactest/tests/sync1008.py b/pactest/tests/sync1008.py index a606459..90c61df 100644 --- a/pactest/tests/sync1008.py +++ b/pactest/tests/sync1008.py @@ -14,6 +14,6 @@ self.args = "-S pkg" -self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg") self.addrule("!PKG_EXIST=cpkg") diff --git a/pactest/tests/sync300.py b/pactest/tests/sync300.py index 31b520a..36d6758 100644 --- a/pactest/tests/sync300.py +++ b/pactest/tests/sync300.py @@ -9,6 +9,6 @@ self.args = "-S %s" % sp1.name -self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 6e7930c..1e2bff3 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -270,6 +270,31 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, (char *)data2, (char *)data2); break; + case PM_TRANS_CONV_REMOVE_PKGS: + { + /* Allocate a buffer big enough to hold all of the + package names */ + char *packagenames; + alpm_list_t *unresolved = (alpm_list_t *) data1; + alpm_list_t *i; + int len = 1, /* for trailing \0 */ where = 0, count = 0; + for (i = unresolved; i; i = i->next) { + count += 1; + len += 3 /* for \t, comma, and \n */ + + strlen(alpm_pkg_get_name(i->data)); + } + packagenames = (char *) malloc(len); + for (i = unresolved; i; i = i->next) { + where += snprintf(&(packagenames[where]), len - where, "\t%s%s\n", + alpm_pkg_get_name(i->data), (i->next) ? "," : ""); + } + *response = yesno(_(":: the following package%s cannot be upgraded due to unresolvable " + "dependencies:\n%s\nDo you want to skip %s package%s for this upgrade?"), + (count > 1) ? "s" : "", packagenames, (count > 1) ? "these" : "this", + (count > 1) ? "s" : ""); + free(packagenames); + } + break; case PM_TRANS_CONV_LOCAL_NEWER: if(!config->op_s_downloadonly) { *response = yesno(_(":: %s-%s: local version is newer. Upgrade anyway?"),

1 0

[pacman-dev] makepkg -R with package() function
by Allan McRae 17 Jan '09

17 Jan '09

Hi, The main thing I need to do to finish the package splitting work (apart from documentation...) is to fix the repackaging. So this is what I intend to do: 1) Old style PKGBUILD [no package() function or splitpkg]: Behaviour unchanged. 2) With package() function or split packages: The package() function or package_*() functions are run. With split packages, the package_*() functions have to be run as that is where all the pkgname, pkgdesc, etc are overridden. I think it makes sense to do so with the package() function too. And I could see that being a lot more helpful as I could fix a broken install line etc while packaging. Comments? Allan

2 1

[pacman-dev] My new patches
by Bryan Ischo 17 Jan '09

17 Jan '09

The first three patches I just sent to the list encompass the new implementation of the IgnorePkg/IgnoreGroup behavior. These changes are much smaller (although the addition of better documentation blocks makes them look bigger than they are in terms of code size) than my previous changes, but they accomplish the same thing (albeit slightly less efficiently in some cases). The last patch is the change to the pactest/README which incorporates feedback from the list. I tried to make these emails include the patches inline but I do not know if I was successful. I used the command: git format-patch --signoff --stdout --inline HEAD^^^^ | git imap-send To generate the emails and get them to my IMAP server, from where I sent them. In future I might use git send-email instead, I found it convenient to use git imap-send but if it doesn't produce properly inlined messages, I can switch to git send-email. Thanks, Bryan

2 1

[pacman-dev] [PATCH 4/4] Fixed some inconsistencies and errors in the pactest documentation.
by Bryan Ischo 17 Jan '09

17 Jan '09

Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- pactest/README | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-)

1 0

[pacman-dev] [PATCH 3/4] Don't prompt the user for unignore of IgnorePkg/IgnoreGroup packages except for packages explicitly listed for sync by the user.
by Bryan Ischo 17 Jan '09

17 Jan '09

This eliminates many unnecessary prompts when IgnorePkg/IgnoreGroup is used. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- lib/libalpm/deps.c | 20 +++++++++++------- lib/libalpm/deps.h | 2 +- lib/libalpm/sync.c | 4 +- pactest/tests/ignore001.py | 17 ++++++++++++++++ pactest/tests/ignore002.py | 35 +++++++++++++++++++++++++++++++++ pactest/tests/ignore003.py | 35 +++++++++++++++++++++++++++++++++ pactest/tests/ignore004.py | 46 ++++++++++++++++++++++++++++++++++++++++++++ pactest/tests/ignore005.py | 46 ++++++++++++++++++++++++++++++++++++++++++++ src/pacman/callback.c | 11 +-------- 9 files changed, 196 insertions(+), 20 deletions(-) create mode 100644 pactest/tests/ignore001.py create mode 100644 pactest/tests/ignore002.py create mode 100644 pactest/tests/ignore003.py create mode 100644 pactest/tests/ignore004.py create mode 100644 pactest/tests/ignore005.py

1 0

[pacman-dev] [PATCH 2/4] Enabled a new prompt to ask the user if they'd like to remove unresolvable packages from the transaction rather than failing it.
by Bryan Ischo 17 Jan '09

17 Jan '09

Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- lib/libalpm/alpm.h | 3 ++- lib/libalpm/deps.c | 2 +- lib/libalpm/sync.c | 24 ++++++++++++++++++------ pactest/tests/provision020.py | 2 +- pactest/tests/provision022.py | 2 +- pactest/tests/sync1008.py | 2 +- pactest/tests/sync300.py | 2 +- src/pacman/callback.c | 25 +++++++++++++++++++++++++ 8 files changed, 50 insertions(+), 12 deletions(-)

1 0

[pacman-dev] [PATCH 1/4] Internal code reorganization in preparation for changes to package resolution.
by Bryan Ischo 17 Jan '09

17 Jan '09

This change reorganizes the internal code so that packages are resolved one at a time instead of all at once from a list. This will allow a future checkin to prompt the user to see if they'd rather remove unresolvable packages from the tranasaction and continue, or fail the transaction. This change does not affect the actual behavior of libalpm and all tests pass without changes. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- lib/libalpm/deps.c | 64 +++++++++++++++++++++++++++++++++++++++++++--------- lib/libalpm/deps.h | 5 ++- lib/libalpm/sync.c | 52 +++++++++++++++++++++++++++++++++--------- 3 files changed, 97 insertions(+), 24 deletions(-)

1 0

[pacman-dev] Should sync_newversion search for replacements?
by Nagy Gabor 16 Jan '09

16 Jan '09

This discussion is motivated by FS#11737. A replacement is nothing more than a simple upgrade with package name change. (This is plausible, but we don't really follow this principle atm.) So if we moved our find_replacments code to sync_newversion our code would be more readable [1]. Benefits: -Qu would also show the should-be-replaced outdated packages. -During this refactoring we could easily implement FS#11737. sync_newversion() on foo would do the following: for each database we try to find a "matching" package (pkgname == foo or bar replaces foo), and we decide if this is an upgrade or not (if not, return with NULL; replacement is always an upgrade). This is exactly what we want. (This demonstrates [1] imho.) Problems: -checking replaces is slower, because we must read some desc files, and sync_newversion() is called in every -S operation (pacman new version check). If the user's first repo is not core, pacman won't find pacman literal in this repo and will search for replacements in this repo before moving to the next repo. This is not a problem with -Su, because now we always search for replacements first. However, this can be easily fixed by adding a check_replacements boolean param to sync_newversion. (However, considering replacements for SyncFirst packages sounds better theoretically: User can specify any package there, not only pacman/glibc whose name probably won't change in the future.) -user interaction around replacements. Solution1: Basically I don't like user interaction. Why this PM_TRANS_CONV_REPLACE_PKG is needed at all? My distro says, that foo is _the_ new version of bar, if I don't want to upgrade bar, I put bar or foo to ignorepkg. (Of course we should at least print warning: "foo replaces bar".) Solution2 (uglier): sync_sysupgrade can compare new and old package name, if they differ this is a replacement and can get user confirmation. (Or other direct communication between the 2 functions.) -however, there is a bigger problem: Multiple package can replace one package (package split). So if we want to be precise, we should change the return value of sync_newversion to a package set (alpm_list), not a simple package, which is totally in needless in most cases. This annoying fact seems to be a show-stopper... (I don't like ugly code ;-) So the question is: Should we follow the following rule?: "At most one package can replace foo per repo." This is restriction on distro side, and usually I don't like restrictions. However, I don't know that we have ever replaced one package by a package set (in Archlinux). And in fact, replacing by a package set can be confusing to the user: "Do you want to replace foo with repo1/bar?" Y "Do you want to replace foo with repo2/baz?" What? I have already replaced foo. I can choose or it is recommended to use both replacement? If repo1 != repo2, probably I don't want to install both replacements (this situation cannot happen in our new approach). In most cases we can live with one replacement ("core" component or using dependencies) If we don't want to follow this rule: Should I drop this whole idea or use alpm_list_t or do you have any better idea? Bye

2 1

[pacman-dev] Another idea
by Bryan Ischo 16 Jan '09

16 Jan '09

Hey all. I've been thinking about my patches and the concerns that list members have had about them and I've come up with a different way of accomplishing the same thing that may be more palatable: - Modify the signature of deps.c:_alpm_resolvedeps so that it takes, instead of a list of packages to resolve, a single package. It would return 0 if the resolve succeeded, 1 if the resolve failed, and would additionally return a list of dependencies that this package needs for this sync. In the parlance of _alpm_resolvedeps, it would return the 'pulled' list. _alpm_resolvedeps would, just as it does now, fail immediately when it encountered an unresolvable dependency, and would not require the graph structure to keep track of dependents. It would be a much simpler change to _alpm_resolvedeps. - Modify sync.c:_alpm_sync_prepare so that it calls _alpm_resolvdeps once per package in the transaction, rather than calling _alpm_resolvedeps once with a list of the packages in the transaction as it does now. As _alpm_resolvedeps is called for each package in the transaction, three lists will be built up in _alpm_sync_prepare: 1. The list of transaction packages (i.e. the "top-level" packages) that were successfully resolved. 2. The list of transaction packages (i.e. the "top-level" packages) that were NOT successfully resolved. 3. The list of "pulled" packages that came from _alpm_resolvedeps for each transaction package that was successfully resolved. After all of the resolution has been done, if the list in (2) is not empty, then these packages are used in the new prompt that asks the user "do you want to ignore these packages for this transaction", and if they say "no", then _alpm_sync_prepare will return a failure status code. If they say "yes", then list (2) will be freed and list (1) and (3) will be used to finish _alpm_sync_prepare as normal (after removing duplicates from (3) as necessary). The advantage of this approach is that it doesn't require any new data structures or helper functions, and changes _alpm_resolvedeps very little. The disadvantage of this approach is that it is less efficient at runtime. Each top-level package will be resolved individually, which means that some work will be duplicated (i.e. if top-level A and B depend on C, and C depends on D and E, then in this new scheme, the C-D-E dependencies will be calculated once for A and once for B, whereas before, it was only calculated once for A, and then the results re-used for B). I would only expect this to have a significant perfomance penalty in large transactions (say a pacman -Su where hundreds of packages were being updated), and I'm not sure exactly how "large" the transaction would have to be before the penalty became unreasonable. I *think* these are the only two approaches: 1. Use a data structure to track dependents, thus gaining runtime efficiency during the resolve of a list of packages, at the expense of extra complexity in the implementation 2. Use no new data structures, instead iterating over each package in the transaction individually, thus gaining simplicity of implementation, at the expense of runtime efficiency I have already implemented (1). If the concern about the code complexity outweighs the concern about performance, then I can implement (2) instead. Please let me know how to proceed. Thanks. Bryan T

4 6

[pacman-dev] [PATCH] Make the repo-add quiet flag less quiet
by aaronmgriffin＠gmail.com 15 Jan '09

15 Jan '09

From: Aaron Griffin <aaronmgriffin(a)gmail.com> Considering one can easily run: repo-add .... >/dev/null to get only warnings and errors, the -q flag is mostly useless. Make the -q flag silence only level 2 messages Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> --- scripts/repo-add.sh.in | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 4f9639c..c89e2a5 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -34,7 +34,6 @@ REPO_DB_FILE="" umask 0022 msg() { - [ $QUIET -ne 0 ] && return local mesg=$1; shift printf "==> ${mesg}\n" "$@" >&1 } @@ -68,8 +67,8 @@ repo-remove will update a package database by removing the package name\n\ specified on the command line from the given repo database. Multiple\n\ packages to remove can be specified on the command line.\n\n")" printf "$(gettext "\ -The -q/--quiet flag to either program will force silent running except\n\ -in the case of warnings or errors.\n\n")" +Use the -q/--quiet flag to minimize output to basic messages, warnings,\n\ +and errors\n\n")" echo "$(gettext "Example: repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz")" echo "$(gettext "Example: repo-remove /path/to/repo.db.tar.gz kernel26")" } -- 1.6.0.5

3 3

[pacman-dev] [PATCH 1/5] Fixed some innacuracies in the pactest README
by Bryan Ischo 14 Jan '09

14 Jan '09

Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- pactest/README | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-)

4 11

[pacman-dev] New Patches
by Bryan Ischo 14 Jan '09

14 Jan '09

Hey all. I've broken my change into 5 patches, which have already been sent to the list. The big one is patch #2, which adds the new ignore logic to deps.c. Although the number of lines edited is large, it's just the addition of a new data structure, some helper methods, and a rework of _alpm_resolvedeps(). There is no way to reduce the size of this patch. I hope that these patches are satisfactory. If you'd just give them a try they should merge nicely into your tree. Create a branch and merge them in and test them out. That's what git is good at right?!? Please note that these patches replace all previous patches I've sent to this list. Thanks, Bryan

2 3

[pacman-dev] [PATCH 5/5] Removed some unwanted error logging, as requested by the pacman-dev list
by Bryan Ischo 14 Jan '09

14 Jan '09

Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- lib/libalpm/deps.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)

1 0

[pacman-dev] [PATCH 4/5] Removed prompt that asked the user if they wanted to install an IgnorePkg/IgnoreGroup dependency
by Bryan Ischo 14 Jan '09

14 Jan '09

This is because the new prompt asking the user if they want to remove the offending packages from the transaction replaces this functionality. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- lib/libalpm/deps.c | 20 +++++++++++------- lib/libalpm/deps.h | 2 +- lib/libalpm/sync.c | 4 +- pactest/tests/ignore001.py | 17 ++++++++++++++++ pactest/tests/ignore002.py | 35 +++++++++++++++++++++++++++++++++ pactest/tests/ignore003.py | 35 +++++++++++++++++++++++++++++++++ pactest/tests/ignore004.py | 46 ++++++++++++++++++++++++++++++++++++++++++++ pactest/tests/ignore005.py | 46 ++++++++++++++++++++++++++++++++++++++++++++ src/pacman/callback.c | 11 +-------- 9 files changed, 196 insertions(+), 20 deletions(-) create mode 100644 pactest/tests/ignore001.py create mode 100644 pactest/tests/ignore002.py create mode 100644 pactest/tests/ignore003.py create mode 100644 pactest/tests/ignore004.py create mode 100644 pactest/tests/ignore005.py

1 0

[pacman-dev] [PATCH 3/5] Added a new transaction callaback question that enables the new ignore unresolved package feature if the user wants to
by Bryan Ischo 14 Jan '09

14 Jan '09

All tests pass. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- lib/libalpm/alpm.h | 2 +- lib/libalpm/deps.c | 4 +--- pactest/tests/provision020.py | 2 +- pactest/tests/provision022.py | 2 +- pactest/tests/sync1008.py | 2 +- pactest/tests/sync300.py | 2 +- src/pacman/callback.c | 25 +++++++++++++++++++++++++ 7 files changed, 31 insertions(+), 8 deletions(-)

1 0

[pacman-dev] [PATCH 2/5] Added logic to support removing ignored packages and their dependents from sync transactions.
by Bryan Ischo 14 Jan '09

14 Jan '09

This code should have no effect on the pacman runtime until a future commit which will enable the logic paths that actually remove ignored packages. In the meantime, all pactest tests pass without any modification. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- lib/libalpm/deps.c | 247 +++++++++++++++++++++++++++++++++++++++++++++++----- lib/libalpm/deps.h | 4 +- lib/libalpm/sync.c | 11 ++- 3 files changed, 231 insertions(+), 31 deletions(-)

1 0

[pacman-dev] Switch to libfetch-only support (was: The official pacman repository branch, master, updated. v3.2.2-58-ge3a0696)
by Dan McGee 14 Jan '09

14 Jan '09

On Tue, Jan 13, 2009 at 7:52 PM, Dan McGee <dan(a)archlinux.org> wrote: > commit 8017b0bb8ec5364f8a3999caffc6b3c3ea991810 > Author: Xavier Chantry <shiningxc(a)gmail.com> > Date: Sat Nov 15 10:10:56 2008 +0100 > > Remove libdownload support and fix libfetch one. > > Aaron said to consider libdownload a dead project so libdownload support was > removed to more easily fix libfetch one (otherwise many ifdef needed). > > There was no direct replacement for ferror to detect an error while > downloading. So instead, I added a check at the end to see if the file was > fully downloaded, which is just a small chunk of code taken from here: > http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/net/libfetch/files/fetch.c?only_… > > Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> > Signed-off-by: Dan McGee <dan(a)archlinux.org> Note that this commit means libdownload is no longer supported. Arch has a libfetch package in testing that works perfectly with pacman built from GIT, so please install that if you want to continue to be able to compile. :) -Dan

2 1