- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH 0/7] Add color to script output
by William Giokas 03 Mar '13

03 Mar '13

With the advent of the pacman color patches, I figured that I would add color output to the rest of the scripts in pacman. This is a kind of not-3am v3 for the previous patch that I sent in. William Giokas (7): 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 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 | 18 +++++++++++++----- 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 +++++ 12 files changed, 93 insertions(+), 38 deletions(-) create mode 100644 scripts/library/term_colors.sh -- 1.8.2.rc1.24.g06d67b8

3 11

[pacman-dev] [PATCH] script: color for pkgdelta, pacman-key, repo-add
by William Giokas 02 Mar '13

02 Mar '13

Use the same color and message/error/warning functions as makepkg in the rest of the pacman scripts. Added a long and short opt for the three. Also, split the message functions into the scripts/library directory, as they are now the same across the board. The new term_colors.sh file is a generic term-color file for use with the output_format functions. makepkg does not use it as it has a configuration file, so it has an added check for using color. Signed-off-by: William Giokas <1007380(a)gmail.com> --- doc/pkgdelta.8.txt | 3 ++ doc/repo-add.8.txt | 3 ++ scripts/library/output_format.sh | 18 ++++++++--- scripts/library/term_colors.sh | 22 +++++++++++++ scripts/makepkg.sh.in | 69 +++++++++++++--------------------------- scripts/pacman-key.sh.in | 8 +++-- scripts/pkgdelta.sh.in | 10 ++++-- scripts/repo-add.sh.in | 5 +++ 8 files changed, 82 insertions(+), 56 deletions(-) create mode 100644 scripts/library/term_colors.sh diff --git a/doc/pkgdelta.8.txt b/doc/pkgdelta.8.txt index 587320a..b864fd2 100644 --- a/doc/pkgdelta.8.txt +++ b/doc/pkgdelta.8.txt @@ -41,6 +41,9 @@ Options *-q, \--quiet*:: Be quiet. Do not output anything but warnings and errors. +*-c, \--color*:: + Use color in output. + Examples -------- diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 91f3ac6..b23142a 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -57,6 +57,9 @@ Common Options If the signature is invalid, an error is produced and the update does not proceed. +*-c, \--color*:: + Use color in output. + repo-add Options ---------------- *-d, \--delta*:: diff --git a/scripts/library/output_format.sh b/scripts/library/output_format.sh index 9e890e7..8861551 100644 --- a/scripts/library/output_format.sh +++ b/scripts/library/output_format.sh @@ -1,21 +1,29 @@ +# Common message formats +# Colors will be empty strings unless defined in the appropriate files. + +plain() { + local mesg=$1; shift + printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 +} + msg() { (( QUIET )) && return local mesg=$1; shift - printf "==> ${mesg}\n" "$@" >&1 + printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&1 } msg2() { (( QUIET )) && return local mesg=$1; shift - printf " -> ${mesg}\n" "$@" >&1 + printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&1 } warning() { local mesg=$1; shift - printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2 + printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } error() { local mesg=$1; shift - printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2 -} \ No newline at end of file + printf "${RED}==> $(gettext "ERROR:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 +} diff --git a/scripts/library/term_colors.sh b/scripts/library/term_colors.sh new file mode 100644 index 0000000..ef1469e --- /dev/null +++ b/scripts/library/term_colors.sh @@ -0,0 +1,22 @@ +# check if messages are to be printed using color +# Uses the variable 'USE_COLOR' to determine whether or not to be used. +unset ALL_OFF BOLD BLUE GREEN RED YELLOW +if [[ -t 2 && ! $USE_COLOR = "n" ]]; then + # prefer terminal safe colored and bold text when tput is supported + if tput setaf 0 &>/dev/null; then + ALL_OFF="$(tput sgr0)" + BOLD="$(tput bold)" + BLUE="${BOLD}$(tput setaf 4)" + GREEN="${BOLD}$(tput setaf 2)" + RED="${BOLD}$(tput setaf 1)" + YELLOW="${BOLD}$(tput setaf 3)" + else + ALL_OFF="\e[1;0m" + BOLD="\e[1;1m" + BLUE="${BOLD}\e[1;34m" + GREEN="${BOLD}\e[1;32m" + RED="${BOLD}\e[1;31m" + YELLOW="${BOLD}\e[1;33m" + fi +fi +readonly ALL_OFF BOLD BLUE GREEN RED YELLOW diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..10d7ee4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -90,33 +90,32 @@ PACMAN_OPTS= shopt -s extglob -### SUBROUTINES ### - -plain() { - local mesg=$1; shift - printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 -} - -msg() { - local mesg=$1; shift - printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 -} - -msg2() { - local mesg=$1; shift - printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 -} +## +# Check if option is present in BUILDENV. Needed for color checking +# +# usage : check_buildenv( $option, $expected_val ) +# return : 0 - matches expected +# 1 - does not match expected +# 127 - not found +## +check_buildenv() { + in_opt_array "$1" ${BUILDENV[@]} + case $? in + 0) # assert enabled + [[ $2 = "y" ]] + return ;; + 1) # assert disabled + [[ $2 = "n" ]] + return ;; + esac -warning() { - local mesg=$1; shift - printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + # not found + return 127 } -error() { - local mesg=$1; shift - printf "${RED}==> $(gettext "ERROR:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 -} +### SUBROUTINES ### +m4_include(library/output_format.sh) ## # Special exit call for traps, Don't print any error messages when inside, @@ -802,30 +801,6 @@ check_option() { ## -# Check if option is present in BUILDENV -# -# usage : check_buildenv( $option, $expected_val ) -# return : 0 - matches expected -# 1 - does not match expected -# 127 - not found -## -check_buildenv() { - in_opt_array "$1" ${BUILDENV[@]} - case $? in - 0) # assert enabled - [[ $2 = "y" ]] - return ;; - 1) # assert disabled - [[ $2 = "n" ]] - return ;; - esac - - # not found - return 127 -} - - -## # usage : in_opt_array( $needle, $haystack ) # return : 0 - enabled # 1 - disabled diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 8f75e2f..8fc069f 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -44,6 +44,7 @@ RECEIVE=0 REFRESH=0 UPDATEDB=0 VERIFY=0 +USE_COLOR='n' DEFAULT_KEYSERVER='hkp://pool.sks-keyservers.net' @@ -67,6 +68,7 @@ usage() { printf -- "$(gettext " -r, --recv-keys Fetch the specified keyids")\n" printf -- "$(gettext " -u, --updatedb Update the trustdb of pacman")\n" printf -- "$(gettext " -v, --verify Verify the file(s) specified by the signature(s)")\n" + printf -- "$(gettext " -c, --color Use color for pacman-key messages (gpg messages not affected)")\n" printf -- "$(gettext " --edit-key Present a menu for key management task on keyids")\n" printf -- "$(gettext " --import Imports pubring.gpg from dir(s)")\n" printf -- "$(gettext " --import-trustdb Imports ownertrust values from trustdb.gpg in dir(s)")\n" @@ -511,8 +513,8 @@ if ! type gettext &>/dev/null; then } fi -OPT_SHORT="adefhlruvV" -OPT_LONG=('add' 'config:' 'delete' 'edit-key' 'export' 'finger' 'gpgdir:' +OPT_SHORT="acdefhlruvV" +OPT_LONG=('add' 'color' 'config:' 'delete' 'edit-key' 'export' 'finger' 'gpgdir:' 'help' 'import' 'import-trustdb' 'init' 'keyserver:' 'list-keys' 'list-sigs' 'lsign-key' 'populate' 'recv-keys' 'refresh-keys' 'updatedb' 'verify' 'version') @@ -548,6 +550,7 @@ while (( $# )); do --refresh-keys) REFRESH=1 ;; -u|--updatedb) UPDATEDB=1 ;; -v|--verify) VERIFY=1 ;; + -c|--color) USE_COLOR='y' ;; -h|--help) usage; exit 0 ;; -V|--version) version; exit 0 ;; @@ -557,6 +560,7 @@ while (( $# )); do shift done +m4_include(library/term_colors.sh) if ! type -p gpg >/dev/null; then error "$(gettext "Cannot find the %s binary required for all %s operations.")" "gpg" "pacman-key" diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index f9b40c9..4ac58cc 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -29,6 +29,7 @@ export TEXTDOMAINDIR='@localedir@' declare -r myver='@PACKAGE_VERSION@' QUIET=0 +USE_COLOR='n' # minimal of package before deltas are generated (bytes) min_pkg_size=$((1024*1024)) @@ -54,6 +55,7 @@ This delta file can then be added to a database using repo-add.\n\n")" echo printf -- "$(gettext "Options:\n")" printf -- "$(gettext " -q, --quiet minimize output\n")" + printf -- "$(gettext " -c, --color colorize output\n")" printf -- "$(gettext " --min-pkg-size minimum package size before deltas are generated\n")" printf -- "$(gettext " --max-delta-size percent of new package above which the delta will be discarded\n")" } @@ -154,8 +156,8 @@ create_xdelta() return 0 } -OPT_SHORT='hqV' -OPT_LONG=('help' 'quiet' 'max-delta-size:' 'min-pkg-size:' 'version') +OPT_SHORT='chqV' +OPT_LONG=('help' 'color' 'quiet' 'max-delta-size:' 'min-pkg-size:' 'version') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 fi @@ -173,6 +175,8 @@ while :; do exit 0 ;; -q|--quiet) QUIET=1;; + -c|--color) + USE_COLOR='y';; --min-pkg-size) if ! min_pkg_size=$(human_to_size "$2"); then echo "invalid argument '$2' for option -- '$1'" @@ -194,6 +198,8 @@ while :; do shift done +m4_include(library/term_colors.sh) + if (( $# != 2 )); then usage exit 1 diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 3e18a1a..d126ae8 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -34,6 +34,7 @@ ONLYADDNEW=0 WITHFILES=0 SIGN=0 VERIFY=0 +USE_COLOR='n' REPO_DB_FILE= LOCKFILE= CLEAN_LOCK=0 @@ -75,6 +76,7 @@ packages to remove can be specified on the command line.\n")" printf -- "$(gettext " -s, --sign sign database with GnuPG after update\n")" printf -- "$(gettext " -k, --key <key> use the specified key to sign the database\n")" printf -- "$(gettext " -v, --verify verify database's signature before update\n")" + printf -- "$(gettext " -c, --color use colors in output, similar to makepkg\n")" printf -- "$(gettext "\n\ See %s(8) for more details and descriptions of the available options.\n")" $cmd printf "\n" @@ -610,6 +612,7 @@ while (( $# )); do -d|--delta) DELTA=1;; -n|--new) ONLYADDNEW=1;; -f|--files) WITHFILES=1;; + -c|--color) USE_COLOR='y';; -s|--sign) check_gpg SIGN=1 @@ -642,6 +645,8 @@ while (( $# )); do shift done +m4_include(library/term_colors.sh) + REPO_DB_FILE=${args[0]} if [[ -z $REPO_DB_FILE ]]; then usage -- 1.8.2.rc1.24.g06d67b8

1 1

[pacman-dev] [PATCH] Do not resolve every local package filelist on remove
by Allan McRae 01 Mar '13

01 Mar '13

Although technically correct, this results in my system taking ~30 seconds to resolve all filelists when removing a package that has a directory not owned by any package. The check for if any package own the empty directory is a rare enough occurance, and it will be even rarer when that directory has a directory symlink in its path, so just revert this at this stage. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/remove.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 60ea8de..0642e04 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -484,7 +484,9 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, continue; } filelist = alpm_pkg_get_files(local_pkg); - _alpm_filelist_resolve(handle, filelist); + /* This is too slow and only covers a rare case + Disable for now... */ + /* _alpm_filelist_resolve(handle, filelist); */ if(alpm_filelist_contains(filelist, fileobj->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "keeping directory %s (owned by %s)\n", file, local_pkg->name); -- 1.8.1.4

1 0

[pacman-dev] [PATCH 1/2] split "Packages (%zd):" message
by Simon Gomizelj 01 Mar '13

01 Mar '13

Basically all translation messages that need colouring but _also_ happen to be format strings need to be split up. This makes it easy to conditionally embed colour codes into the output at runtime. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- src/pacman/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 3270c74..b5ee841 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -871,7 +871,7 @@ static void _display_targets(alpm_list_t *targets, int verbose) } /* print to screen */ - pm_asprintf(&str, _("Packages (%zd):"), alpm_list_count(targets)); + pm_asprintf(&str, "%s (%zd):", _("Packages"), alpm_list_count(targets)); printf("\n"); cols = getcols(fileno(stdout)); -- 1.8.1.4

3 3

[pacman-dev] [PATCH] refactor common code in query_search/sync_search
by Simon Gomizelj 28 Feb '13

28 Feb '13

Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- src/pacman/package.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/package.h | 3 ++ src/pacman/query.c | 56 +------------------------------------- src/pacman/sync.c | 76 +++------------------------------------------------ 4 files changed, 85 insertions(+), 127 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 330f7ab..6daf745 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -341,4 +341,81 @@ void dump_pkg_changelog(alpm_pkg_t *pkg) } } +void print_installed(alpm_db_t *db_local, alpm_pkg_t *pkg) +{ + const char *pkgname = alpm_pkg_get_name(pkg); + const char *pkgver = alpm_pkg_get_version(pkg); + alpm_pkg_t *lpkg = alpm_db_get_pkg(db_local, pkgname); + if(lpkg) { + const char *lpkgver = alpm_pkg_get_version(lpkg); + if(strcmp(lpkgver, pkgver) == 0) { + printf(" [%s]", _("installed")); + } else { + printf(" [%s: %s]", _("installed"), lpkgver); + } + } +} + +/* search a database for a matching package */ +int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, alpm_db_t *installed_in) +{ + int freelist = 0; + alpm_list_t *i, *searchlist; + unsigned short cols; + + /* if we have a targets list, search for packages matching it */ + if(targets) { + searchlist = alpm_db_search(db, targets); + freelist = 1; + } else { + searchlist = alpm_db_get_pkgcache(db); + freelist = 0; + } + if(searchlist == NULL) { + return 1; + } + + cols = getcols(fileno(stdout)); + for(i = searchlist; i; i = alpm_list_next(i)) { + alpm_list_t *grp; + alpm_pkg_t *pkg = i->data; + + if(config->quiet) { + fputs(alpm_pkg_get_name(pkg), stdout); + } else { + printf("%s/%s %s", alpm_db_get_name(db), + alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + + if((grp = alpm_pkg_get_groups(pkg)) != NULL) { + alpm_list_t *k; + fputs(" (", stdout); + for(k = grp; k; k = alpm_list_next(k)) { + const char *group = k->data; + fputs(group, stdout); + if(alpm_list_next(k)) { + /* only print a spacer if there are more groups */ + putchar(' '); + } + } + putchar(')'); + } + + if (installed_in) + print_installed(installed_in, pkg); + + /* we need a newline and initial indent first */ + fputs("\n ", stdout); + indentprint(alpm_pkg_get_desc(pkg), 4, cols); + } + fputc('\n', stdout); + } + + /* we only want to free if the list was a search list */ + if(freelist) { + alpm_list_free(searchlist); + } + + return 0; +} + /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/package.h b/src/pacman/package.h index 47fbcad..635d5f7 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -28,6 +28,9 @@ void dump_pkg_backups(alpm_pkg_t *pkg); void dump_pkg_files(alpm_pkg_t *pkg, int quiet); void dump_pkg_changelog(alpm_pkg_t *pkg); +void print_installed(alpm_db_t *db_local, alpm_pkg_t *pkg); +int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, alpm_db_t *installed_in); + #endif /* _PM_PACKAGE_H */ /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/query.c b/src/pacman/query.c index 1247c3d..416f92c 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -262,62 +262,8 @@ targcleanup: /* search the local database for a matching package */ static int query_search(alpm_list_t *targets) { - alpm_list_t *i, *searchlist; - int freelist; alpm_db_t *db_local = alpm_get_localdb(config->handle); - unsigned short cols; - - /* if we have a targets list, search for packages matching it */ - if(targets) { - searchlist = alpm_db_search(db_local, targets); - freelist = 1; - } else { - searchlist = alpm_db_get_pkgcache(db_local); - freelist = 0; - } - if(searchlist == NULL) { - return 1; - } - - cols = getcols(fileno(stdout)); - for(i = searchlist; i; i = alpm_list_next(i)) { - alpm_list_t *grp; - alpm_pkg_t *pkg = i->data; - - if(!config->quiet) { - printf(LOCAL_PREFIX "%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); - } else { - fputs(alpm_pkg_get_name(pkg), stdout); - } - - - if(!config->quiet) { - if((grp = alpm_pkg_get_groups(pkg)) != NULL) { - alpm_list_t *k; - fputs(" (", stdout); - for(k = grp; k; k = alpm_list_next(k)) { - const char *group = k->data; - fputs(group, stdout); - if(alpm_list_next(k)) { - /* only print a spacer if there are more groups */ - putchar(' '); - } - } - putchar(')'); - } - - /* we need a newline and initial indent first */ - fputs("\n ", stdout); - indentprint(alpm_pkg_get_desc(pkg), 4, cols); - } - fputc('\n', stdout); - } - - /* we only want to free if the list was a search list */ - if(freelist) { - alpm_list_free(searchlist); - } - return 0; + return dump_pkg_search(db_local, targets, NULL); } static int query_group(alpm_list_t *targets) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 924cdf5..b1cc3fe 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -352,87 +352,19 @@ static int sync_synctree(int level, alpm_list_t *syncs) return (success > 0); } -static void print_installed(alpm_db_t *db_local, alpm_pkg_t *pkg) -{ - const char *pkgname = alpm_pkg_get_name(pkg); - const char *pkgver = alpm_pkg_get_version(pkg); - alpm_pkg_t *lpkg = alpm_db_get_pkg(db_local, pkgname); - if(lpkg) { - const char *lpkgver = alpm_pkg_get_version(lpkg); - if(strcmp(lpkgver, pkgver) == 0) { - printf(" [%s]", _("installed")); - } else { - printf(" [%s: %s]", _("installed"), lpkgver); - } - } -} - /* search the sync dbs for a matching package */ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) { - alpm_list_t *i, *j, *ret; - int freelist; - int found = 0; + alpm_list_t *i; alpm_db_t *db_local = alpm_get_localdb(config->handle); + int found = 0; for(i = syncs; i; i = alpm_list_next(i)) { alpm_db_t *db = i->data; - unsigned short cols; - /* if we have a targets list, search for packages matching it */ - if(targets) { - ret = alpm_db_search(db, targets); - freelist = 1; - } else { - ret = alpm_db_get_pkgcache(db); - freelist = 0; - } - if(ret == NULL) { - continue; - } else { - found = 1; - } - cols = getcols(fileno(stdout)); - for(j = ret; j; j = alpm_list_next(j)) { - alpm_list_t *grp; - alpm_pkg_t *pkg = j->data; - - if(!config->quiet) { - printf("%s/%s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); - } else { - fputs(alpm_pkg_get_name(pkg), stdout); - } - - if(!config->quiet) { - if((grp = alpm_pkg_get_groups(pkg)) != NULL) { - alpm_list_t *k; - fputs(" (", stdout); - for(k = grp; k; k = alpm_list_next(k)) { - const char *group = k->data; - fputs(group, stdout); - if(alpm_list_next(k)) { - /* only print a spacer if there are more groups */ - putchar(' '); - } - } - putchar(')'); - } - - print_installed(db_local, pkg); - - /* we need a newline and initial indent first */ - fputs("\n ", stdout); - indentprint(alpm_pkg_get_desc(pkg), 4, cols); - } - fputc('\n', stdout); - } - /* we only want to free if the list was a search list */ - if(freelist) { - alpm_list_free(ret); - } + found += !dump_pkg_search(db, targets, db_local); } - return !found; + return (found == 0); } static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) -- 1.8.1.4

1 0