- Pacman-dev - lists.archlinux.org

[pacman-dev] pacman transactions
by Renan Biegelmeyer 06 Mar '13

06 Mar '13

Hello, I'm trying to understand, in pacman/libalpm code how the transactions work. Are they atomic? If so, the transactions are only atomic for the local database or they are also atomic for the instalation/upgrade/removal of the packages in the system? Thanks, Renan

3 2

[pacman-dev] [PATCHv2 00/10] Add color to script output
by William Giokas 06 Mar '13

06 Mar '13

This is a version two of the original pacman script color patches that I sent in. This includes three new patches, and a fix to the first patch so that I don't break `pkgver()` functions in makepkg. --- Originally, output_format.sh sent some messages to sdtout and some to stderr, but this patch set sends all messages formatted by output_format to stderr making separation of script output and child processes easy to separate. The QUIET variable can be used to get the equivalent of only printing stderr. I'm going to start working on using a flag to determine where the messages from output_format go, as per Dave's suggestion. The script patches try to implement the same color styles as makepkg, mostly by consolidating the message formats into a single library file and including that in all of the files that require it. In the pacdiff patch, I simply changed the colors, making it use a similar format as the other files. output_format also got a new function, `ask`, that looks similar to `msg2` but without a new line at the end for use with `read`. I don't know if the look is okay, I was thinking about making it look like pacman's questions, with a pair of blue colons instead of an arrow. If anyone has input on this, please speak up. The rest of the patches just implement a similar look as makepkg, using `==>` and `->` to precede messages, and colored errors and warnings. The use of a unified output_format file also affords makepkg the --quiet option, setting the `QUIET` variable to suppress messages that are not warnings, errors or output from a command in a PKGBUILD. --- William Giokas (10): script: Add color to library/output_format.sh makepkg: use output_format, add --quiet option script: add color to pacman-db-upgrade scripts: add color to pacman-key scripts: add color to pacman-optimize scripts: add color to pkgdelta scripts: add color to repo-add contrib: add colored output to bacman contrib: add color to paccache contrib: make pacdiff colors same as scripts contrib/bacman.sh.in | 62 ++++++++++++++++++++++------------------ contrib/paccache.sh.in | 19 ++++++------ contrib/pacdiff.sh.in | 35 ++++++----------------- doc/makepkg.8.txt | 4 +++ doc/pacman-key.8.txt | 3 ++ doc/repo-add.8.txt | 3 ++ scripts/library/README | 6 +++- scripts/library/output_format.sh | 23 +++++++++++---- scripts/library/term_colors.sh | 21 ++++++++++++++ scripts/makepkg.sh.in | 35 +++++------------------ scripts/pacman-db-upgrade.sh.in | 11 ++++++- scripts/pacman-key.sh.in | 8 ++++-- scripts/pacman-optimize.sh.in | 11 ++++++- scripts/pkgdelta.sh.in | 6 ++++ scripts/repo-add.sh.in | 5 ++++ 15 files changed, 149 insertions(+), 103 deletions(-) create mode 100644 scripts/library/term_colors.sh Thank you, -- William Giokas 1.8.2.rc1.24.g06d67b8

2 15

[pacman-dev] [PATCH 1/2] Add staticlibs option in PKGBUILD
by Sébastien Luttringer 05 Mar '13

05 Mar '13

This option helps to removes static library files in packages. Related to the thread: https://mailman.archlinux.org/pipermail/arch-dev-public/2013-March/024552.h… Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- doc/PKGBUILD.5.txt | 4 ++++ doc/makepkg.conf.5.txt | 6 +++++- etc/makepkg.conf.in | 21 +++++++++++---------- scripts/makepkg.sh.in | 9 +++++++-- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index c37477a..ea280a0 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -243,6 +243,10 @@ A normal sync or upgrade will not use its value. Leave libtool (.la) files in packages. Specify `!libtool` to remove them. + *staticlibs*;; + Leave static library (.a) files in packages. Specify `!staticlibs` to + remove them. + *emptydirs*;; Leave empty directories in packages. diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 71cfc5d..0d1cf00 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -138,7 +138,7 @@ Options Specify a key to use for gpg signing instead of the default key in the keyring. Can be overridden with makepkg's '\--key' option. -**OPTIONS=(**strip docs libtool emptydirs zipman purge !upx**)**:: +**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge !upx**)**:: This array contains options that affect the default packaging. They are equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or @@ -160,6 +160,10 @@ Options Leave libtool (.la) files in packages. Specify `!libtool` to remove them. + *staticlibs*;; + Leave static library (.a) files in packages. Specify `!staticlibs` to + remove them. + *emptydirs*;; Leave empty directories in packages. diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 1436042..b2bf811 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -68,16 +68,17 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) # Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx !debug) # A negated option will do the opposite of the comments below. # -#-- strip: Strip symbols from binaries/libraries -#-- docs: Save doc directories specified by DOC_DIRS -#-- libtool: Leave libtool (.la) files in packages -#-- emptydirs: Leave empty directories in packages -#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip -#-- purge: Remove files specified by PURGE_TARGETS -#-- upx: Compress binary executable files using UPX -#-- debug: Add debugging flags as specified in DEBUG_* variables -# -OPTIONS=(strip docs libtool emptydirs zipman purge !upx !debug) +#-- strip: Strip symbols from binaries/libraries +#-- docs: Save doc directories specified by DOC_DIRS +#-- libtool: Leave libtool (.la) files in packages +#-- staticlibs: Leave static library (.a) files in packages +#-- emptydirs: Leave empty directories in packages +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS +#-- upx: Compress binary executable files using UPX +#-- debug: Add debugging flags as specified in DEBUG_* variables +# +OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..9b89c63 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -44,8 +44,8 @@ declare -r confdir='@sysconfdir@' declare -r BUILDSCRIPT='@BUILDSCRIPT@' declare -r startdir="$PWD" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx' \ - 'debug') +packaging_options=('strip' 'docs' 'libtool' 'staticlibs' 'emptydirs' 'zipman' \ + 'purge' 'upx' 'debug') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \ 'groups' 'depends' 'optdepends' 'provides' 'conflicts' \ @@ -1503,6 +1503,11 @@ tidy_install() { find . ! -type d -name "*.la" -exec rm -f -- '{}' \; fi + if check_option "staticlibs" "n"; then + msg2 "$(gettext "Removing "%s" files...")" "static library" + find . ! -type d -name "*.a" -exec rm -f -- '{}' + + fi + if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" find . -depth -type d -exec rmdir '{}' + 2>/dev/null -- 1.8.1.5

2 2

[pacman-dev] [PATCH 1/2] Add staticlibs option in PKGBUILD
by Sébastien Luttringer 04 Mar '13

04 Mar '13

This option helps to removes static library files in packages. Related to the thread: https://mailman.archlinux.org/pipermail/arch-dev-public/2013-March/024552.h… Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- doc/PKGBUILD.5.txt | 4 ++++ doc/makepkg.conf.5.txt | 6 +++++- etc/makepkg.conf.in | 21 +++++++++++---------- scripts/makepkg.sh.in | 9 +++++++-- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index c37477a..ea280a0 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -243,6 +243,10 @@ A normal sync or upgrade will not use its value. Leave libtool (.la) files in packages. Specify `!libtool` to remove them. + *staticlibs*;; + Leave static library (.a) files in packages. Specify `!staticlibs` to + remove them. + *emptydirs*;; Leave empty directories in packages. diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 71cfc5d..0d1cf00 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -138,7 +138,7 @@ Options Specify a key to use for gpg signing instead of the default key in the keyring. Can be overridden with makepkg's '\--key' option. -**OPTIONS=(**strip docs libtool emptydirs zipman purge !upx**)**:: +**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge !upx**)**:: This array contains options that affect the default packaging. They are equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or @@ -160,6 +160,10 @@ Options Leave libtool (.la) files in packages. Specify `!libtool` to remove them. + *staticlibs*;; + Leave static library (.a) files in packages. Specify `!staticlibs` to + remove them. + *emptydirs*;; Leave empty directories in packages. diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 1436042..b2bf811 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -68,16 +68,17 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) # Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx !debug) # A negated option will do the opposite of the comments below. # -#-- strip: Strip symbols from binaries/libraries -#-- docs: Save doc directories specified by DOC_DIRS -#-- libtool: Leave libtool (.la) files in packages -#-- emptydirs: Leave empty directories in packages -#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip -#-- purge: Remove files specified by PURGE_TARGETS -#-- upx: Compress binary executable files using UPX -#-- debug: Add debugging flags as specified in DEBUG_* variables -# -OPTIONS=(strip docs libtool emptydirs zipman purge !upx !debug) +#-- strip: Strip symbols from binaries/libraries +#-- docs: Save doc directories specified by DOC_DIRS +#-- libtool: Leave libtool (.la) files in packages +#-- staticlibs: Leave static library (.a) files in packages +#-- emptydirs: Leave empty directories in packages +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS +#-- upx: Compress binary executable files using UPX +#-- debug: Add debugging flags as specified in DEBUG_* variables +# +OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..a48512e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -44,8 +44,8 @@ declare -r confdir='@sysconfdir@' declare -r BUILDSCRIPT='@BUILDSCRIPT@' declare -r startdir="$PWD" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx' \ - 'debug') +packaging_options=('strip' 'docs' 'libtool' 'staticlibs' 'emptydirs' 'zipman' \ + 'purge' 'upx' 'debug') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \ 'groups' 'depends' 'optdepends' 'provides' 'conflicts' \ @@ -1503,6 +1503,11 @@ tidy_install() { find . ! -type d -name "*.la" -exec rm -f -- '{}' \; fi + if check_option "staticlibs" "n"; then + msg2 "$(gettext "Removing "%s" files...")" "static library" + find . ! -type d -name "*.a" -delete + fi + if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" find . -depth -type d -exec rmdir '{}' + 2>/dev/null -- 1.8.1.5

2 2

[pacman-dev] [PATCH] Add liba option in PKGBUILD
by Sébastien Luttringer 04 Mar '13

04 Mar '13

This option (enabled by default) removes static library files in packages. Related to the thread: https://mailman.archlinux.org/pipermail/arch-dev-public/2013-March/024552.h… Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- doc/PKGBUILD.5.txt | 4 ++++ doc/makepkg.conf.5.txt | 6 +++++- etc/makepkg.conf.in | 3 ++- scripts/makepkg.sh.in | 9 +++++++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index c37477a..1e64b8f 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -243,6 +243,10 @@ A normal sync or upgrade will not use its value. Leave libtool (.la) files in packages. Specify `!libtool` to remove them. + *liba*;; + Leave static library (.a) files in packages. Specify `!liba` to + remove them. + *emptydirs*;; Leave empty directories in packages. diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 71cfc5d..94f2a0c 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -138,7 +138,7 @@ Options Specify a key to use for gpg signing instead of the default key in the keyring. Can be overridden with makepkg's '\--key' option. -**OPTIONS=(**strip docs libtool emptydirs zipman purge !upx**)**:: +**OPTIONS=(**strip docs libtool !liba emptydirs zipman purge !upx**)**:: This array contains options that affect the default packaging. They are equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or @@ -160,6 +160,10 @@ Options Leave libtool (.la) files in packages. Specify `!libtool` to remove them. + *liba*;; + Leave static library (.a) files in packages. Specify `!liba` to remove + them. + *emptydirs*;; Leave empty directories in packages. diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 1436042..8af8e3f 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -71,13 +71,14 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) #-- strip: Strip symbols from binaries/libraries #-- docs: Save doc directories specified by DOC_DIRS #-- libtool: Leave libtool (.la) files in packages +#-- liba: Leave static library (.a) files in packages #-- emptydirs: Leave empty directories in packages #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip #-- purge: Remove files specified by PURGE_TARGETS #-- upx: Compress binary executable files using UPX #-- debug: Add debugging flags as specified in DEBUG_* variables # -OPTIONS=(strip docs libtool emptydirs zipman purge !upx !debug) +OPTIONS=(strip docs libtool !liba emptydirs zipman purge !upx !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..274739c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -44,8 +44,8 @@ declare -r confdir='@sysconfdir@' declare -r BUILDSCRIPT='@BUILDSCRIPT@' declare -r startdir="$PWD" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx' \ - 'debug') +packaging_options=('strip' 'docs' 'libtool' 'liba' 'emptydirs' 'zipman' \ + 'purge' 'upx' 'debug') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \ 'groups' 'depends' 'optdepends' 'provides' 'conflicts' \ @@ -1503,6 +1503,11 @@ tidy_install() { find . ! -type d -name "*.la" -exec rm -f -- '{}' \; fi + if check_option "liba" "n"; then + msg2 "$(gettext "Removing "%s" files...")" "static libraries" + find . ! -type d -name "*.a" -exec rm -f -- '{}' \; + fi + if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" find . -depth -type d -exec rmdir '{}' + 2>/dev/null -- 1.8.1.5

3 5

[pacman-dev] [PATCH] libalpm: Search for replacers before literals
by Olivier Brunel 04 Mar '13

04 Mar '13

Since 882bff36 literals would be searched before replacers, resulting in a package being replaced by another not actually being replaced under certain conditions (e.g. they're both in the same repo). This change effectively reversed the expectations in test sync132. This patch switches the order back to replacers first, thus making sure if a package is replacing another one, the change will always happen, even if both are in the same repo. Note that a package replacing another one in a repo with higher priority will not be done, see FS#11737 Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- lib/libalpm/sync.c | 26 ++++++++++++++------------ test/pacman/tests/replace102.py | 2 -- test/pacman/tests/sync132.py | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 204456d..01e9e0c 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -209,24 +209,26 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) continue; } - /* Search for literal then replacers in each sync database. */ + /* Search for replacers then literal (if no replacer) in each sync database. */ for(j = handle->dbs_sync; j; j = j->next) { alpm_db_t *sdb = j->data; /* Check sdb */ - alpm_pkg_t *spkg = _alpm_db_get_pkgfromcache(sdb, lpkg->name); - int literal_upgrade = 0; - if(spkg) { - literal_upgrade = check_literal(handle, lpkg, spkg, enable_downgrade); - if(literal_upgrade) { - trans->add = alpm_list_add(trans->add, spkg); - } + alpm_list_t *replacers; + replacers = check_replacers(handle, lpkg, sdb); + if(replacers) { + trans->add = alpm_list_join(trans->add, replacers); /* jump to next local package */ break; } else { - alpm_list_t *replacers; - replacers = check_replacers(handle, lpkg, sdb); - if(replacers) { - trans->add = alpm_list_join(trans->add, replacers); + alpm_pkg_t *spkg = _alpm_db_get_pkgfromcache(sdb, lpkg->name); + if(spkg) { + int literal_upgrade = 0; + literal_upgrade = check_literal(handle, lpkg, spkg, enable_downgrade); + if(literal_upgrade) { + trans->add = alpm_list_add(trans->add, spkg); + } + /* jump to next local package */ + break; } } } diff --git a/test/pacman/tests/replace102.py b/test/pacman/tests/replace102.py index ca05d4e..fe0bdad 100644 --- a/test/pacman/tests/replace102.py +++ b/test/pacman/tests/replace102.py @@ -21,5 +21,3 @@ self.addrule("!PKG_EXIST=python-yaml") self.addrule("PKG_VERSION=python2-yaml|5-1") self.addrule("FILE_EXIST=lib/python2/file") - -self.expectfailure = True diff --git a/test/pacman/tests/sync132.py b/test/pacman/tests/sync132.py index 2d671c7..5e85727 100644 --- a/test/pacman/tests/sync132.py +++ b/test/pacman/tests/sync132.py @@ -14,5 +14,5 @@ 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.8.1.5

2 3

[pacman-dev] [PATCH] libalpm: Fix installing update of a replaced package
by Olivier Brunel 03 Mar '13

03 Mar '13

During a sysupgrade, if a package is replaced by another, and an update for the former package is found (on another repo) the replaced package would be re-installed. Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- I'm not really familiar with inner workings of ALPM, so this is probably not the best way to do this. lib/libalpm/sync.c | 13 ++++++++++++- test/pacman/tests/sync1104.py | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 test/pacman/tests/sync1104.py diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 204456d..31f5870 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -351,6 +351,16 @@ finish: return ret; } +static int _cmp_pkg (alpm_pkg_t *pkg1, alpm_pkg_t *pkg2) +{ + if (!pkg1) + return 1; + else if (!pkg2) + return -1; + else + return strcmp (pkg1->name, pkg2->name); +} + int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) { alpm_list_t *i, *j; @@ -408,7 +418,8 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) building up a list of packages which could not be resolved. */ for(i = trans->add; i; i = i->next) { alpm_pkg_t *pkg = i->data; - if(_alpm_resolvedeps(handle, localpkgs, pkg, trans->add, + if(!alpm_list_find(remove, pkg, (alpm_list_fn_cmp) _cmp_pkg) + && _alpm_resolvedeps(handle, localpkgs, pkg, trans->add, &resolved, remove, data) == -1) { unresolvable = alpm_list_add(unresolvable, pkg); } diff --git a/test/pacman/tests/sync1104.py b/test/pacman/tests/sync1104.py new file mode 100644 index 0000000..5cec98a --- /dev/null +++ b/test/pacman/tests/sync1104.py @@ -0,0 +1,18 @@ +self.description = "Don't update (reinstall) a replaced package" + +lp = pmpkg("old", "1-1") +self.addpkg2db("local", lp) + +p1 = pmpkg("new") +p1.provides = ["old"] +p1.replaces = ["old"] +self.addpkg2db("sync1", p1) + +p2 = pmpkg("old", "1-2") +self.addpkg2db("sync2", p2) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=old") +self.addrule("PKG_EXIST=new") -- 1.8.1.4

4 8

[pacman-dev] [PATCHv2] libalpm: Fix installing update of a replaced package
by Olivier Brunel 03 Mar '13

03 Mar '13

During a sysupgrade, if a package is replaced by another, and an update for the former package is found (on another repo) the replaced package would be re-installed. Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- lib/libalpm/sync.c | 2 ++ test/pacman/tests/sync1104.py | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 test/pacman/tests/sync1104.py diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 204456d..2a56115 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -396,6 +396,8 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) alpm_pkg_t *spkg = i->data; for(j = spkg->removes; j; j = j->next) { remove = alpm_list_add(remove, j->data); + /* do not re-install a (replaced) package even if an update is available */ + trans->add = alpm_list_remove(trans->add, j->data, _alpm_pkg_cmp, NULL); } } diff --git a/test/pacman/tests/sync1104.py b/test/pacman/tests/sync1104.py new file mode 100644 index 0000000..5cec98a --- /dev/null +++ b/test/pacman/tests/sync1104.py @@ -0,0 +1,18 @@ +self.description = "Don't update (reinstall) a replaced package" + +lp = pmpkg("old", "1-1") +self.addpkg2db("local", lp) + +p1 = pmpkg("new") +p1.provides = ["old"] +p1.replaces = ["old"] +self.addpkg2db("sync1", p1) + +p2 = pmpkg("old", "1-2") +self.addpkg2db("sync2", p2) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=old") +self.addrule("PKG_EXIST=new") -- 1.8.1.5

1 0

[pacman-dev] [PATCH 2/3] print yesno questions on /dev/tty if available
by Simon Gomizelj 03 Mar '13

03 Mar '13

Attempt to print yesno questions on /dev/tty so that ideally the user can't miss them, especially when redirecting stdout/stderr to file. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- src/pacman/util.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 3270c74..4532f84 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1449,11 +1449,11 @@ static int question(short preset, char *fmt, va_list args) char response[32]; FILE *stream; int fd_in = fileno(stdin); + int rc = preset; - if(config->noconfirm) { - stream = stdout; - } else { - /* Use stderr so questions are always displayed when redirecting output */ + stream = fopen("/dev/tty", "w"); + if(stream == NULL) { + /* if we can't get at the underlying tty, fallback on stderr */ stream = stderr; } @@ -1471,7 +1471,7 @@ static int question(short preset, char *fmt, va_list args) if(config->noconfirm) { fprintf(stream, "\n"); - return preset; + goto cleanup; } fflush(stream); @@ -1480,7 +1480,7 @@ static int question(short preset, char *fmt, va_list args) if(fgets(response, sizeof(response), stdin)) { size_t len = strtrim(response); if(len == 0) { - return preset; + goto cleanup; } /* if stdin is piped, response does not get printed out, and as a result @@ -1490,12 +1490,18 @@ static int question(short preset, char *fmt, va_list args) } if(strcasecmp(response, _("Y")) == 0 || strcasecmp(response, _("YES")) == 0) { - return 1; + rc = 1; } else if(strcasecmp(response, _("N")) == 0 || strcasecmp(response, _("NO")) == 0) { - return 0; + rc = 0; } } - return 0; + +cleanup: + if(stream != stdout) { + fclose(stream); + } + + return rc; } int yesno(char *fmt, ...) -- 1.8.1.4

3 3

[pacman-dev] [PATCH 2/2] fix typos in pacman tests
by Andrew Gregory 03 Mar '13

03 Mar '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/tests/fileconflict006.py | 4 ++-- test/pacman/tests/fileconflict016.py | 2 +- test/pacman/tests/symlink002.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/pacman/tests/fileconflict006.py b/test/pacman/tests/fileconflict006.py index 84afff2..d3c20ba 100644 --- a/test/pacman/tests/fileconflict006.py +++ b/test/pacman/tests/fileconflict006.py @@ -3,8 +3,8 @@ p1 = pmpkg("pkg1", "1.0-1") p1.files = ["test/", "test/file1", - "test/dir/file1", - "test/dir/file2"] + "test/dir/file1", + "test/dir/file2"] self.addpkg2db("local", p1) p2 = pmpkg("pkg2") diff --git a/test/pacman/tests/fileconflict016.py b/test/pacman/tests/fileconflict016.py index c5daf48..86ddd72 100644 --- a/test/pacman/tests/fileconflict016.py +++ b/test/pacman/tests/fileconflict016.py @@ -14,7 +14,7 @@ p2 = pmpkg("pkg2") p2.files = ["usr/", "usr/lib/", - "usr/lib/foo"] + "usr/lib/foo"] self.addpkg2db("sync", p2) self.args = "-S pkg1 pkg2" diff --git a/test/pacman/tests/symlink002.py b/test/pacman/tests/symlink002.py index 6b7423d..7c23c77 100644 --- a/test/pacman/tests/symlink002.py +++ b/test/pacman/tests/symlink002.py @@ -37,7 +37,7 @@ self.addrule("PKG_EXIST=dummy3") self.addrule("LINK_EXIST=etc/brokenlink3") -self.addrule("!FILE_EXIST=etc/nonexistent") +self.addrule("!FILE_EXIST=etc/nonexistent3") self.addrule("FILE_EXIST=etc/exists3") self.addrule("FILE_TYPE=etc/brokenlink3|link") self.addrule("FILE_TYPE=etc/exists3|file") -- 1.8.1.4

2 1