April 2009 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix a possible bash-4.0 problem in makepkg
by Marc - A. Dahlhaus 28 Apr '09

28 Apr '09

Hello, i've spotted a problem in makepkg's cleanup part if the host is running bash-4.0. As makepkg runs bash with option -e, on bash-4.0 it fails if strip reports an unsupported binary. The following trivial patch fixes the problem. Signed-off-by: "Marc - A. Dahlhaus" <mad(a)wol.de> --- pacman-3.2.2.orig/scripts/makepkg.sh.in +++ pacman-3.2.2/scripts/makepkg.sh.in @@ -766,11 +766,11 @@ tidy_install() { find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in *application/x-sharedlib*) # Libraries (.so) - /usr/bin/strip --strip-debug "$binary";; + /usr/bin/strip --strip-debug "$binary" || true;; *application/x-archive*) # Libraries (.a) - /usr/bin/strip --strip-debug "$binary";; + /usr/bin/strip --strip-debug "$binary" || true;; *application/x-executable*) # Binaries - /usr/bin/strip "$binary";; + /usr/bin/strip "$binary" || true;; esac done fi --- pacman-3.2.2.orig/scripts/makepkg.sh.in +++ pacman-3.2.2/scripts/makepkg.sh.in @@ -766,11 +766,11 @@ tidy_install() { find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in *application/x-sharedlib*) # Libraries (.so) - /usr/bin/strip --strip-debug "$binary";; + /usr/bin/strip --strip-debug "$binary" || true;; *application/x-archive*) # Libraries (.a) - /usr/bin/strip --strip-debug "$binary";; + /usr/bin/strip --strip-debug "$binary" || true;; *application/x-executable*) # Binaries - /usr/bin/strip "$binary";; + /usr/bin/strip "$binary" || true;; esac done fi

5 9

[pacman-dev] [PATCH] makepkg: make in-place sed portable
by Allan McRae 28 Apr '09

28 Apr '09

Do a sed replacement in-place is not very portable. On Mac OSX and BSDs, the syntax is "sed -i ''" where as with GNU sed the command is "sed -i''" or just "sed -i". This patch detects which command should be used during configure. Credit to Kevin Barry who researched this issue and provided a patch to work around this using temporary backup files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 5 +++++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 5dcbe79..a83d5e4 100644 --- a/configure.ac +++ b/configure.ac @@ -180,9 +180,11 @@ GCC_GNU89_INLINE_CC # Host-dependant definitions SIZECMD="stat -c %s" +SEDINPLACE="sed -i" case "${host_os}" in *bsd*) SIZECMD="stat -f %z" + SEDINPLACE="sed -i ''" ;; cygwin*) host_os_cygwin=yes @@ -191,12 +193,14 @@ case "${host_os}" in darwin*) host_os_darwin=yes SIZECMD="/usr/bin/stat -f %z" + SEDINPLACE="sed -i ''" ;; esac AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_SUBST(SIZECMD) +AC_SUBST(SEDINPLACE) # Check for architecture, used in default makepkg.conf # (Note single space left after CARCHFLAGS) @@ -356,6 +360,7 @@ ${PACKAGE_NAME}: Architecture flags : ${CARCHFLAGS} Host Type : ${CHOST} Filesize command : ${SIZECMD} + In-place sed command : ${SEDINPLACE} libalpm version : ${LIB_VERSION} libalpm version info : ${LIB_VERSION_INFO} diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 5a2b780..5d65653 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -41,6 +41,7 @@ edit = sed \ -e 's|@DBEXT[@]|$(DBEXT)|g' \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ + -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g' ## All the scripts depend on Makefile so that they are rebuilt when the diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c97eff2..ca25fbb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1171,8 +1171,8 @@ devel_update() { if [ -n "$newpkgver" ]; then if [ "$newpkgver" != "$pkgver" ]; then if [ -f "./$BUILDSCRIPT" ]; then - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" - sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" + @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" + @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" source "$BUILDSCRIPT" fi fi -- 1.6.2.4

3 3

[pacman-dev] [PATCH] makepkg: do not update pkgver when building source package
by Allan McRae 27 Apr '09

27 Apr '09

When making a source package for a SCM PKGBUILD, makepkg should not update the pkgver/pkgrel. Noted in FS#14456. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 97acfb4..c97eff2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1098,14 +1098,13 @@ install_package() { devel_check() { newpkgver="" - # Only update pkgver if --holdver is not set - if [ "$HOLDVER" -eq 1 ]; then - return - fi - # Cannot update pkgver/pkgrel if reading PKGBUILD from pipe - if [ ! -f "./$BUILDSCRIPT" ]; then + + # Do not update pkgver if --holdver is set, when building a source package, + # or when reading PKGBUILD from pipe + if [ "$HOLDVER" -eq 1 -o "$SOURCEONLY" -ne 0 -o ! -f "./$BUILDSCRIPT" ]; then return fi + if [ -z "$FORCE_VER" ]; then # Check if this is a svn/cvs/etc PKGBUILD; set $newpkgver if so. # This will only be used on the first call to makepkg; subsequent -- 1.6.2.4

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-144-gc279046
by dan＠archlinux.org 26 Apr '09

26 Apr '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 c27904661ef96cb2e7c729ce82b527146529c768 (commit) from 10584ec8eab873ffb4b03dd8e4a4703dabed8955 (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 c27904661ef96cb2e7c729ce82b527146529c768 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 26 20:58:04 2009 +1000 makepkg: make in-place sed portable Do a sed replacement in-place is not very portable. On Mac OSX and BSDs, the syntax is "sed -i ''" where as with GNU sed the command is "sed -i''" or just "sed -i". This patch detects which command should be used during configure. Credit to Kevin Barry who researched this issue and provided a patch to work around this using temporary backup files. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 5 +++++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Stripping files on OSX
by Allan McRae 26 Apr '09

26 Apr '09

Hi all, I am looking for people in the know about how files should be stripped on Mac OSX. In FS#13592, it is suggested that we do some more fine grained tuning of our library stripping. These should work for platforms using GNU strip (Linux/BSD/Cygwin): Binaries: "strip --strip-all" Shared Libraries: "strip --strip-unneeded" Static Libraries: "strip --strip-debug" Can we do something similar on OSX? From [1], it looks like similar options are: Binaries: "strip -u -r" Shared Libraries: "strip -x" Static Libraries: "strip -S Can someone confirm if these options are any good? I could be entirely wrong... [1] http://developer.apple.com/documentation/Darwin/Reference/ManPages/man1/str… Allan

1 0

[pacman-dev] [PATCH] Remove unused error codes and handle PM_ERR_RETRIEVE by alpm_strerror()
by Nagy Gabor 18 Apr '09

18 Apr '09

>From 88c26a6e5902875f07ca7c842971619530fa5aa9 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 18 Apr 2009 17:35:08 +0200 Subject: [PATCH] Remove unused error codes and handle PM_ERR_RETRIEVE by alpm_strerror() Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 9 --------- lib/libalpm/error.c | 17 ++--------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 48b6ba2..57ea880 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -487,31 +487,22 @@ enum _pmerrno_t { PM_ERR_TRANS_NOT_PREPARED, PM_ERR_TRANS_ABORT, PM_ERR_TRANS_TYPE, - PM_ERR_TRANS_COMMITING, - PM_ERR_TRANS_DOWNLOADING, /* Packages */ PM_ERR_PKG_NOT_FOUND, PM_ERR_PKG_IGNORED, PM_ERR_PKG_INVALID, PM_ERR_PKG_OPEN, - PM_ERR_PKG_LOAD, - PM_ERR_PKG_CANT_FRESH, PM_ERR_PKG_CANT_REMOVE, PM_ERR_PKG_INVALID_NAME, PM_ERR_PKG_REPO_NOT_FOUND, /* Deltas */ PM_ERR_DLT_INVALID, PM_ERR_DLT_PATCHFAILED, - /* Groups */ - PM_ERR_GRP_NOT_FOUND, /* Dependencies */ PM_ERR_UNSATISFIED_DEPS, PM_ERR_CONFLICTING_DEPS, PM_ERR_FILE_CONFLICTS, /* Misc */ - PM_ERR_USER_ABORT, - PM_ERR_INTERNAL_ERROR, - PM_ERR_DB_SYNC, PM_ERR_RETRIEVE, PM_ERR_INVALID_REGEX, /* External library errors */ diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 01dc758..47f0750 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -99,10 +99,6 @@ const char SYMEXPORT *alpm_strerror(int err) return _("transaction aborted"); case PM_ERR_TRANS_TYPE: return _("operation not compatible with the transaction type"); - case PM_ERR_TRANS_COMMITING: - return _("could not commit transaction"); - case PM_ERR_TRANS_DOWNLOADING: - return _("could not download all files"); /* Packages */ case PM_ERR_PKG_NOT_FOUND: return _("could not find or read package"); @@ -112,10 +108,6 @@ const char SYMEXPORT *alpm_strerror(int err) return _("invalid or corrupted package"); case PM_ERR_PKG_OPEN: return _("cannot open package file"); - case PM_ERR_PKG_LOAD: - return _("cannot load package data"); - case PM_ERR_PKG_CANT_FRESH: - return _("package not installed or lesser version"); case PM_ERR_PKG_CANT_REMOVE: return _("cannot remove all files for package"); case PM_ERR_PKG_INVALID_NAME: @@ -127,9 +119,6 @@ const char SYMEXPORT *alpm_strerror(int err) return _("invalid or corrupted delta"); case PM_ERR_DLT_PATCHFAILED: return _("delta patch failed"); - /* Groups */ - case PM_ERR_GRP_NOT_FOUND: - return _("group not found"); /* Dependencies */ case PM_ERR_UNSATISFIED_DEPS: return _("could not satisfy dependencies"); @@ -138,10 +127,8 @@ const char SYMEXPORT *alpm_strerror(int err) case PM_ERR_FILE_CONFLICTS: return _("conflicting files"); /* Miscellaenous */ - case PM_ERR_USER_ABORT: - return _("user aborted the operation"); - case PM_ERR_INTERNAL_ERROR: - return _("internal error"); + case PM_ERR_RETRIEVE: + return _("failed to retrieve some files"); case PM_ERR_INVALID_REGEX: return _("invalid regular expression"); /* Errors from external libraries- our own wrapper error */ -- 1.6.0.3

1 1

[pacman-dev] some more delta stats
by Xavier 18 Apr '09

18 Apr '09

I generated deltas for the last 20 updates on my system. The total delta size is 12M, while the total package size is 73M. So the overall ratio is pretty good imo. Afaik, only one delta on the 20 didn't reach the 0.7 ratio : attr The ghostscript one is unbelievable : 5,7K vs 29M ! Here are the packages, deltas and their size : 56K attr-2.4.41-1_to_2.4.43-1-x86_64.delta 79K attr-2.4.43-1-x86_64.pkg.tar.gz 3,6K crda-0.9.5-2_to_1.0.1-1-x86_64.delta 13K crda-1.0.1-1-x86_64.pkg.tar.gz 254K curl-7.19.3-1_to_7.19.4-1-x86_64.delta 555K curl-7.19.4-1-x86_64.pkg.tar.gz 444K e2fsprogs-1.41.3-2_to_1.41.4-1-x86_64.delta 1,3M e2fsprogs-1.41.4-1-x86_64.pkg.tar.gz 5,7K ghostscript-8.64-2_to_8.64-3-x86_64.delta 29M ghostscript-8.64-3-x86_64.pkg.tar.gz 2,5M git-1.6.1.3-1_to_1.6.2-1-x86_64.delta 6,4M git-1.6.2-1-x86_64.pkg.tar.gz 39K hdparm-9.10-1_to_9.12-1-x86_64.delta 56K hdparm-9.12-1-x86_64.pkg.tar.gz 6,1K iw-0.9.8-1_to_0.9.9-1-x86_64.delta 15K iw-0.9.9-1-x86_64.pkg.tar.gz 369K kbd-1.14.1.20080309-2_to_1.15-1-x86_64.delta 1013K kbd-1.15-1-x86_64.pkg.tar.gz 569 libmad-0.15.1b-3_to_0.15.1b-4-x86_64.delta 132K libmad-0.15.1b-4-x86_64.pkg.tar.gz 89K libsndfile-1.0.18-1_to_1.0.19-1-x86_64.delta 423K libsndfile-1.0.19-1-x86_64.pkg.tar.gz 17K libv4l-0.5.7-1_to_0.5.8-1-x86_64.delta 56K libv4l-0.5.8-1-x86_64.pkg.tar.gz 79K libxi-1.1.4-2-x86_64.pkg.tar.gz 47K libxi-1.2.0-1_to_1.1.4-2-x86_64.delta 4,1K man-db-2.5.4-1_to_2.5.4-2-x86_64.delta 959K man-db-2.5.4-2-x86_64.pkg.tar.gz 1,2M man-pages-3.18-1_to_3.19-1-x86_64.delta 4,4M man-pages-3.19-1-x86_64.pkg.tar.gz 1,5M ncurses-5.7-2.1-x86_64.pkg.tar.gz 263K ncurses-5.7-2_to_5.7-2.1-x86_64.delta 951K nvidia-180.22-1_to_180.29-3-x86_64.delta 2,6M nvidia-180.29-3-x86_64.pkg.tar.gz 6,1M nvidia-utils-180.22-1_to_180.29-3-x86_64.delta 11M nvidia-utils-180.29-3-x86_64.pkg.tar.gz 1,2K pm-utils-1.2.4-1_to_1.2.4-3-x86_64.delta 39K pm-utils-1.2.4-3-x86_64.pkg.tar.gz 5,6K run-parts-2.30-1_to_2.31-1-x86_64.delta 8,9K run-parts-2.31-1-x86_64.pkg.tar.gz

4 7

[pacman-dev] [PATCH] Introduce destarch keyword into makepkg
by Thomas Bächler 17 Apr '09

17 Apr '09

If destarch is added to a PKGBUILD, makepkg sets the architecture of the resulting package to $destarch instead of $CARCH. This is useful if you want to cross-create packages for one architecture on the other. Using arch=('i686') destarch='x86_64' makes it possible to build multilib packages and to build grub without the export CARCH="x86_64" hack. --- scripts/makepkg.sh.in | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bce2e6c..c45d7e8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -152,7 +152,7 @@ clean_up() { rm -rf pkg src if [ "$pkgname" != "" ]; then # Can't do this unless the BUILDSCRIPT has been sourced. - rm -f "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log*" + rm -f "${pkgname}-${pkgver}-${pkgrel}-${destarch}.log*" fi fi @@ -662,7 +662,7 @@ run_build() { local ret=0 if [ "$LOGGING" = "1" ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" + BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${destarch}.log" if [ -f "$BUILDLOG" ]; then local i=1 while true; do @@ -792,8 +792,8 @@ create_package() { echo "builddate = $builddate" >>.PKGINFO echo "packager = $packager" >>.PKGINFO echo "size = $size" >>.PKGINFO - if [ "$CARCH" != "" ]; then - echo "arch = $CARCH" >>.PKGINFO + if [ "$destarch" != "" ]; then + echo "arch = $destarch" >>.PKGINFO fi if [ "$(check_option force)" = "y" ]; then echo "force = true" >> .PKGINFO @@ -851,7 +851,7 @@ create_package() { # tar it up msg2 "$(gettext "Compressing package...")" - local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" + local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT}" if ! bsdtar -czf "$pkg_file" $comp_files *; then error "$(gettext "Failed to create package file.")" @@ -872,11 +872,11 @@ create_xdelta() { local pkginfo="$(mktemp "$startdir"/xdelta-pkginfo.XXXXXXXXX)" local old_file old_version - for old_file in $(ls {"$cache_dir","$PKGDEST"}/${pkgname}-*-*{,-$CARCH}$PKGEXT 2>/dev/null); do + for old_file in $(ls {"$cache_dir","$PKGDEST"}/${pkgname}-*-*{,-$destarch}$PKGEXT 2>/dev/null); do bsdtar -xOf "$old_file" .PKGINFO > "$pkginfo" || continue if [ "$(cat "$pkginfo" | grep '^pkgname = ')" != "pkgname = $pkgname" ]; then continue # Package name does not match. - elif [ "$(cat "$pkginfo" | grep '^arch = ')" != "arch = $CARCH" ] ; then + elif [ "$(cat "$pkginfo" | grep '^arch = ')" != "arch = $destarch" ] ; then continue # Not same arch. fi @@ -894,7 +894,7 @@ create_xdelta() { if [ "$base_file" != "" ]; then msg "$(gettext "Making delta from version %s...")" "$latest_version" - local delta_file="$PKGDEST/$pkgname-${latest_version}_to_$pkgver-$pkgrel-$CARCH.delta" + local delta_file="$PKGDEST/$pkgname-${latest_version}_to_$pkgver-$pkgrel-$destarch.delta" local ret=0 # xdelta will decompress base_file & pkg_file into TMP_DIR (or /tmp if @@ -984,9 +984,9 @@ install_package() { [ "$INSTALL" = "0" ] && return msg "$(gettext "Installing package ${pkgname} with pacman -U...")" if [ "$ASROOT" = "0" ]; then - sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} || exit $? + sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT} || exit $? else - pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} || exit $? + pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT} || exit $? fi } @@ -1330,6 +1330,10 @@ if [ "$arch" = 'any' ]; then CARCH='any' fi +if [ -z "$destarch" ]; then + destarch="$CARCH" +fi + if ! in_array $CARCH ${arch[@]}; then if [ "$IGNOREARCH" = "0" ]; then error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgname" "$CARCH" @@ -1374,7 +1378,7 @@ unset valid_options opt known kopt devel_check devel_update -if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ +if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT}" \ -a "$FORCE" = "0" -a "$SOURCEONLY" = "0" -a "$NOBUILD" = "0" ]; then if [ "$INSTALL" = "1" ]; then warning "$(gettext "A package has already been built, installing existing package...")" @@ -1402,7 +1406,7 @@ if [ "$INFAKEROOT" = "1" ]; then exit 0 # $E_OK fi -msg "$(gettext "Making package: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))" +msg "$(gettext "Making package: %s")" "$pkgname $pkgver-$pkgrel $destarch ($(date))" if [ $EUID -eq 0 ]; then warning "$(gettext "Running makepkg as root...")" @@ -1504,10 +1508,10 @@ else fi fi - create_xdelta "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" + create_xdelta "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT}" fi -msg "$(gettext "Finished making: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))" +msg "$(gettext "Finished making: %s")" "$pkgname $pkgver-$pkgrel $destarch ($(date))" install_package -- 1.5.6

8 30

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-143-g10584ec
by dan＠archlinux.org 16 Apr '09

16 Apr '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 10584ec8eab873ffb4b03dd8e4a4703dabed8955 (commit) from db3e166503386b4f9e456017fd56d8bce84528fe (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 10584ec8eab873ffb4b03dd8e4a4703dabed8955 Author: Loui Chang <louipc.ist(a)gmail.com> Date: Thu Oct 2 19:47:19 2008 -0400 Mention required libraries in INSTALL. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: INSTALL | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove find_replacements().
by Nagy Gabor 13 Apr '09

13 Apr '09

From bf937acf544b836fd322a94cbf9e41bc7f609284 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon, 13 Apr 2009 15:08:38 +0200 Subject: [PATCH] Remove find_replacements(). "Foo replaces bar" simply means that "foo is a new version of bar". So this patch refactors the code to use this "rule". _alpm_sync_sysupgrade now does the following for each local package [bar] (pseudo-code): for db in syncdbs { if(db contains bar) {check if db/bar is an upgrade; break;} replacers = find(bar replacers in db); if(replacers!=NULL) {ask_user;break;} } Note: 1. Replacers are grouped per repo. 2. If repo1/foo and repo2/foo both replaces bar, only repo1/foo is considered (if repo1 stands before repo2 in pacman.conf). FS#11737 fixed. 3. It can happen that pacman doesn't consider any replacer, if pacman found a literal "earlier", so sync132.py modified accordingly (btw, that situation should not appear irl). The new code doesn't use sync_newversion(), so I removed the "local is newer than repo" message, which was annoying with -Qu and pacman new version check. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/sync.c | 200 ++++++++++++++++++--------------------------- pactest/tests/sync132.py | 4 +- 2 files changed, 82 insertions(+), 122 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 1dbd93d..039fd27 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -48,86 +48,15 @@ #include "dload.h" #include "delta.h" -/* Find recommended replacements for packages during a sync. - */ -static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync) -{ - alpm_list_t *i, *j, *k; /* wow */ - - ALPM_LOG_FUNC; - - /* check for "recommended" package replacements */ - _alpm_log(PM_LOG_DEBUG, "checking for package replacements\n"); - for(i = dbs_sync; i; i = i->next) { - pmdb_t *db = i->data; - - /* for each db, check each package's REPLACES list */ - for(j = _alpm_db_get_pkgcache(db); j; j = j->next) { - pmpkg_t *spkg = j->data; - - for(k = alpm_pkg_get_replaces(spkg); k; k = k->next) { - const char *replacement = k->data; - - pmpkg_t *lpkg = _alpm_db_get_pkgfromcache(db_local, replacement); - if(!lpkg) { - continue; - } - - _alpm_log(PM_LOG_DEBUG, "checking replacement '%s' for package '%s'\n", - replacement, spkg->name); - /* ignore if EITHER the local or replacement package are to be ignored */ - if(_alpm_pkg_should_ignore(spkg) || _alpm_pkg_should_ignore(lpkg)) { - _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"), - alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg), - alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); - } else { - int doreplace = 0; - QUESTION(trans, PM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, db->treename, &doreplace); - if(!doreplace) { - continue; - } - - /* if confirmed, add this to the 'final' list, designating 'lpkg' as - * the package to replace. - */ - - /* check if spkg->name is already in the packages list. */ - /* TODO: same package name doesn't mean same package */ - pmpkg_t *tpkg = _alpm_pkg_find(trans->packages, alpm_pkg_get_name(spkg)); - if(tpkg) { - /* found it -- just append to the removes list */ - tpkg->removes = alpm_list_add(tpkg->removes, lpkg); - /* check the to-be-replaced package's reason field */ - if(alpm_pkg_get_reason(lpkg) == PM_PKG_REASON_EXPLICIT) { - tpkg->reason = PM_PKG_REASON_EXPLICIT; - } - } else { - /* none found -- enter pkg into the final sync list */ - /* copy over reason */ - spkg->reason = alpm_pkg_get_reason(lpkg); - spkg->removes = alpm_list_add(NULL, lpkg); - _alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n", - alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); - trans->packages = alpm_list_add(trans->packages, spkg); - } - _alpm_log(PM_LOG_DEBUG, "%s-%s elected for removal (to be replaced by %s-%s)\n", - alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg), - alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); - } - } - } - } - return(0); -} - /** Check for new version of pkg in sync repos * (only the first occurrence is considered in sync) */ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync) { + ASSERT(pkg != NULL, return(NULL)); + alpm_list_t *i; pmpkg_t *spkg = NULL; - int cmp; for(i = dbs_sync; !spkg && i; i = i->next) { spkg = _alpm_db_get_pkgfromcache(i->data, alpm_pkg_get_name(pkg)); @@ -140,77 +69,108 @@ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync) } /* compare versions and see if spkg is an upgrade */ - cmp = _alpm_pkg_compare_versions(spkg, pkg); - if(cmp > 0) { + if(_alpm_pkg_compare_versions(spkg, pkg) > 0) { _alpm_log(PM_LOG_DEBUG, "new version of '%s' found (%s => %s)\n", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg), alpm_pkg_get_version(spkg)); return(spkg); } - if (cmp < 0) { - pmdb_t *db = spkg->origin_data.db; - _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"), - alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg), - alpm_db_get_name(db), alpm_pkg_get_version(spkg)); - } + /* spkg is not an upgrade */ return(NULL); } int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync) { - alpm_list_t *i, *j, *replaced = NULL; + alpm_list_t *i, *j, *k; ALPM_LOG_FUNC; - /* check for "recommended" package replacements */ - if(find_replacements(trans, db_local, dbs_sync)) { - return(-1); - } - - /* compute the to-be-replaced packages for efficiency */ - for(i = trans->packages; i; i = i->next) { - pmpkg_t *spkg = i->data; - for(j = spkg->removes; j; j = j->next) { - replaced = alpm_list_add(replaced, j->data); - } - } - - /* for all not-replaced local package we check for upgrade */ _alpm_log(PM_LOG_DEBUG, "checking for package upgrades\n"); for(i = _alpm_db_get_pkgcache(db_local); i; i = i->next) { - pmpkg_t *local = i->data; + pmpkg_t *lpkg = i->data; - if(_alpm_pkg_find(replaced, alpm_pkg_get_name(local))) { - _alpm_log(PM_LOG_DEBUG, "'%s' is already elected for removal -- skipping\n", - alpm_pkg_get_name(local)); + if(_alpm_pkg_find(trans->packages, lpkg->name)) { + _alpm_log(PM_LOG_DEBUG, "%s is already in the target list -- skipping\n", lpkg->name); continue; } - pmpkg_t *spkg = alpm_sync_newversion(local, dbs_sync); - if(spkg) { - /* we found a new version */ - /* skip packages in IgnorePkg or in IgnoreGroup */ - if(_alpm_pkg_should_ignore(spkg)) { - _alpm_log(PM_LOG_WARNING, _("%s: ignoring package upgrade (%s => %s)\n"), - alpm_pkg_get_name(local), alpm_pkg_get_version(local), - alpm_pkg_get_version(spkg)); - continue; - } + /* Search for literal then replacers in each sync database. + * If found, don't check other databases */ + for(j = dbs_sync; j; j = j->next) { + pmdb_t *sdb = j->data; + /* Check sdb */ + pmpkg_t *spkg = _alpm_db_get_pkgfromcache(sdb, lpkg->name); + if(spkg) { /* 1. literal was found in sdb */ + int cmp = _alpm_pkg_compare_versions(spkg, lpkg); + if(cmp > 0) { + _alpm_log(PM_LOG_DEBUG, "new version of '%s' found (%s => %s)\n", + lpkg->name, lpkg->version, spkg->version); + /* check IgnorePkg/IgnoreGroup */ + if(_alpm_pkg_should_ignore(spkg) || _alpm_pkg_should_ignore(lpkg)) { + _alpm_log(PM_LOG_WARNING, _("%s: ignoring package upgrade (%s => %s)\n"), + lpkg->name, lpkg->version, spkg->version); + } else { + _alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n", + spkg->name, spkg->version); + trans->packages = alpm_list_add(trans->packages, spkg); + } + } else if(cmp < 0) { + _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"), + lpkg->name, lpkg->version, sdb->treename, spkg->version); + } + break; /* jump to next local package */ + } else { /* 2. search for replacers in sdb */ + int found = 0; + for(k = _alpm_db_get_pkgcache(sdb); k; k = k->next) { + spkg = k->data; + if(alpm_list_find_str(alpm_pkg_get_replaces(spkg), lpkg->name)) { + found = 1; + /* check IgnorePkg/IgnoreGroup */ + if(_alpm_pkg_should_ignore(spkg) || _alpm_pkg_should_ignore(lpkg)) { + _alpm_log(PM_LOG_WARNING, _("ignoring package replacement (%s-%s => %s-%s)\n"), + lpkg->name, lpkg->version, spkg->name, spkg->version); + continue; + } - /* add the upgrade package to the target list */ - if(_alpm_pkg_find(trans->packages, alpm_pkg_get_name(spkg))) { - /* avoid duplicated targets */ - continue; + int doreplace = 0; + QUESTION(trans, PM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, sdb->treename, &doreplace); + if(!doreplace) { + continue; + } + + /* If spkg is already in the target list, we append lpkg to spkg's removes list */ + pmpkg_t *tpkg = _alpm_pkg_find(trans->packages, spkg->name); + if(tpkg) { + /* sanity check, multiple repos can contain spkg->name */ + if(tpkg->origin_data.db != sdb) { + _alpm_log(PM_LOG_WARNING, _("cannot replace %s by %s\n"), + lpkg->name, spkg->name); + continue; + } + _alpm_log(PM_LOG_DEBUG, "appending %s to the removes list of %s", + lpkg->name, tpkg->name); + tpkg->removes = alpm_list_add(tpkg->removes, lpkg); + /* check the to-be-replaced package's reason field */ + if(alpm_pkg_get_reason(lpkg) == PM_PKG_REASON_EXPLICIT) { + tpkg->reason = PM_PKG_REASON_EXPLICIT; + } + } else { /* add spkg to the target list */ + /* copy over reason */ + spkg->reason = alpm_pkg_get_reason(lpkg); + spkg->removes = alpm_list_add(NULL, lpkg); + _alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n", + spkg->name, spkg->version); + trans->packages = alpm_list_add(trans->packages, spkg); + } + } + } + if(found) { + break; /* jump to next local package */ + } } - _alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n", - alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); - /* we don't set any reason here, - it will be calculated from local package in add_commit */ - trans->packages = alpm_list_add(trans->packages, spkg); } } - alpm_list_free(replaced); return(0); } diff --git a/pactest/tests/sync132.py b/pactest/tests/sync132.py index 5e85727..2d671c7 100644 --- a/pactest/tests/sync132.py +++ b/pactest/tests/sync132.py @@ -14,5 +14,5 @@ self.addpkg2db("local", lp) self.args = "-Su" self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pkg1") -self.addrule("!PKG_EXIST=pkg2") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") -- 1.6.0.3

1 1