- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-156-g7c956d5
by dan＠archlinux.org 03 Sep '11

03 Sep '11

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 7c956d5d4bdf89bfece1244baa56a92f83bd9161 (commit) via 98fdfa1968f81596acd25ed5b77cc968dcd97ead (commit) via 37da18aee8d925ee5cd9f526f2c61d07e9db5b66 (commit) via d88e524e7c6e902dcf1c0afed52def0d8b430b25 (commit) via 062c391919e93f1d669deb3ffec60457d57e7d27 (commit) via 16fd66f879abd52a636ba00cd782b37b1fcf8a65 (commit) via d9545103b9a9517cb8996562d990431094027663 (commit) via 5a9b07b0e7fc73dc85f07bbab5cba007efe8d8aa (commit) via 24f4f9822fe8c6758e72577173495705cfcc6713 (commit) via 3c3ee6796a417cdd06be5639989a570b22318a20 (commit) via 83a1e4fee39321358858841069e1fe36d44edefc (commit) via c51b9ca0ad897428a008701e35f8f11fa0ad9046 (commit) from ad051f7328cb8fed19070651aac314d64de1b815 (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 7c956d5d4bdf89bfece1244baa56a92f83bd9161 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 18:01:33 2011 -0500 Add -p/--print tip for -Q operations on filepath Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 98fdfa1968f81596acd25ed5b77cc968dcd97ead Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 17:35:50 2011 -0500 Former transaction callback rename refactor Put all the callback stuff in alpm.h in one spot, and make the following renames for clarity with the new structure: ALPM_TRANS_EVT_* --> ALPM_EVENT_* ALPM_TRANS_CONV_* --> ALPM_QUESTION_* ALPM_TRANS_PROGRESS_* --> ALPM_PROGRESS_* alpm_option_get_convcb() --> alpm_option_get_questioncb() alpm_option_set_convcb() --> alpm_option_set_questioncb() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 37da18aee8d925ee5cd9f526f2c61d07e9db5b66 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 17:16:56 2011 -0500 Move all callbacks up to the handle level This was just disgusting before, unnecessary to limit these to only usage in a transaction. Still a lot of more room for cleanup but we'll start by attaching them to the handle rather than the transaction we may or may not even want to use these callbacks. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d88e524e7c6e902dcf1c0afed52def0d8b430b25 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 17:13:13 2011 -0500 Be fully silent on any -Sp operation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 062c391919e93f1d669deb3ffec60457d57e7d27 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 16:00:48 2011 -0500 Make delta validation/application more logical The call to apply was tucked inside validate, and the EVENT callbacks were done outside the function rather than inside. Reorganize things a bit to make more sense. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 16fd66f879abd52a636ba00cd782b37b1fcf8a65 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 15:29:25 2011 -0500 pacman-key: add --refresh-keys operation This allows new signatures to be pulled, revocations to be found, etc. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d9545103b9a9517cb8996562d990431094027663 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 15:20:53 2011 -0500 pacman-key: split keyserver to a separate option This also renames '--receive' to '-recv-keys' to match the wrapped gpg option name, rather than invent a new one, now that the calling convention is the same. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5a9b07b0e7fc73dc85f07bbab5cba007efe8d8aa Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 15:04:28 2011 -0500 pacman-key help and documentation cleanup We were using the mystical [<foobar>] options which is some sort of cross between a <required> argument and an [optional] one. Remove this madness and do some other general cleanup/consistency work in the manpage. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 24f4f9822fe8c6758e72577173495705cfcc6713 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 15:03:39 2011 -0500 doc: consistency when referencing other options Use '\--option' rather than `--option` everywhere. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3c3ee6796a417cdd06be5639989a570b22318a20 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 14:47:33 2011 -0500 pacman-key: document --lsign-key Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 83a1e4fee39321358858841069e1fe36d44edefc Author: Dan McGee <dan(a)archlinux.org> Date: Fri Sep 2 19:26:07 2011 -0500 Clean up handling of size fields We currently have csize, isize, and size concepts, and sometimes the difference isn't clear. Ensure the following holds: * size (aka csize): always the compressed size of the package; available for everything except local packages (where it will return 0) * isize: always the installed size of the package; available for all three package types Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c51b9ca0ad897428a008701e35f8f11fa0ad9046 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 29 13:30:03 2011 -0500 pactest: remove PACMAN_OUTPUT from ldconfig tests This removes the last usages of this rule that aren't explicitly looking at real output from pacman. Notably, these tests depended on one particular debug logger not ever being changed, which is too fragile, not to mention doesn't work at all with --nolog. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 7 +- doc/index.txt | 6 +- doc/makepkg.8.txt | 2 +- doc/makepkg.conf.5.txt | 4 +- doc/pacman-key.8.txt | 39 ++++-- lib/libalpm/add.c | 20 ++-- lib/libalpm/alpm.h | 246 ++++++++++++++++++++------------------ lib/libalpm/be_local.c | 16 +--- lib/libalpm/be_sync.c | 8 -- lib/libalpm/conflict.c | 5 +- lib/libalpm/delta.c | 7 +- lib/libalpm/deps.c | 6 +- lib/libalpm/diskspace.c | 6 +- lib/libalpm/handle.c | 39 ++++++ lib/libalpm/handle.h | 24 ++++- lib/libalpm/package.c | 5 +- lib/libalpm/package.h | 1 - lib/libalpm/remove.c | 14 +- lib/libalpm/sync.c | 103 ++++++++-------- lib/libalpm/trans.c | 7 +- lib/libalpm/trans.h | 26 +---- lib/libalpm/util.c | 2 +- scripts/pacman-key.sh.in | 53 +++++---- src/pacman/callback.c | 92 ++++++++------- src/pacman/callback.h | 12 +- src/pacman/conf.c | 3 + src/pacman/query.c | 6 + src/pacman/sync.c | 4 +- src/pacman/util.c | 8 +- test/pacman/ldconfig.stub | 4 + test/pacman/pmtest.py | 7 +- test/pacman/tests/ldconfig001.py | 9 +- test/pacman/tests/ldconfig002.py | 7 +- test/pacman/tests/ldconfig003.py | 7 +- test/pacman/util.py | 1 + 35 files changed, 429 insertions(+), 377 deletions(-) create mode 100755 test/pacman/ldconfig.stub hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Clean up handling of size fields
by Dan McGee 03 Sep '11

03 Sep '11

We currently have csize, isize, and size concepts, and sometimes the difference isn't clear. Ensure the following holds: * size (aka csize): always the compressed size of the package; available for everything except local packages (where it will return 0) * isize: always the installed size of the package; available for all three package types Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.h | 3 ++- lib/libalpm/be_local.c | 16 +--------------- lib/libalpm/be_sync.c | 8 -------- lib/libalpm/delta.c | 7 +++---- lib/libalpm/package.c | 5 +---- lib/libalpm/package.h | 1 - lib/libalpm/sync.c | 13 ++++++------- 7 files changed, 13 insertions(+), 40 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 42e6038..cfc2a10 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -653,7 +653,8 @@ const char *alpm_pkg_get_sha256sum(alpm_pkg_t *pkg); */ const char *alpm_pkg_get_arch(alpm_pkg_t *pkg); -/** Returns the size of the package. +/** Returns the size of the package. This is only available for sync database + * packages and package files, not those loaded from the local database. * @param pkg a pointer to package * @return the size of the package in bytes. */ diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index dc9e361..ba41544 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -99,12 +99,6 @@ static const char *_cache_get_arch(alpm_pkg_t *pkg) return pkg->arch; } -static off_t _cache_get_size(alpm_pkg_t *pkg) -{ - LAZY_LOAD(INFRQ_DESC, -1); - return pkg->size; -} - static off_t _cache_get_isize(alpm_pkg_t *pkg) { LAZY_LOAD(INFRQ_DESC, -1); @@ -243,7 +237,6 @@ static struct pkg_operations local_pkg_ops = { .get_installdate = _cache_get_installdate, .get_packager = _cache_get_packager, .get_arch = _cache_get_arch, - .get_size = _cache_get_size, .get_isize = _cache_get_isize, .get_reason = _cache_get_reason, .has_scriptlet = _cache_has_scriptlet, @@ -621,15 +614,8 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) READ_NEXT(); info->reason = (alpm_pkgreason_t)atoi(line); } else if(strcmp(line, "%SIZE%") == 0) { - /* NOTE: the CSIZE and SIZE fields both share the "size" field - * in the pkginfo_t struct. This can be done b/c CSIZE - * is currently only used in sync databases, and SIZE is - * only used in local databases. - */ READ_NEXT(); - info->size = _alpm_strtoofft(line); - /* also store this value to isize */ - info->isize = info->size; + info->isize = _alpm_strtoofft(line); } else if(strcmp(line, "%REPLACES%") == 0) { READ_AND_SPLITDEP(info->replaces); } else if(strcmp(line, "%DEPENDS%") == 0) { diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 982d355..7eb2539 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -561,16 +561,8 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, } else if(strcmp(line, "%PACKAGER%") == 0) { READ_AND_STORE(pkg->packager); } else if(strcmp(line, "%CSIZE%") == 0) { - /* Note: the CSIZE and SIZE fields both share the "size" field in the - * pkginfo_t struct. This can be done b/c CSIZE is currently only used - * in sync databases, and SIZE is only used in local databases. - */ READ_NEXT(); pkg->size = _alpm_strtoofft(line); - /* also store this value to isize if isize is unset */ - if(pkg->isize == 0) { - pkg->isize = pkg->size; - } } else if(strcmp(line, "%ISIZE%") == 0) { READ_NEXT(); pkg->isize = _alpm_strtoofft(line); diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index c88955f..1dd2bf4 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -249,12 +249,11 @@ static alpm_list_t *find_unused(alpm_list_t *deltas, const char *to, off_t quota alpm_list_t SYMEXPORT *alpm_pkg_unused_deltas(alpm_pkg_t *pkg) { - off_t pkgsize = alpm_pkg_get_size(pkg); - alpm_list_t *unused = find_unused( + ASSERT(pkg != NULL, return NULL); + return find_unused( alpm_pkg_get_deltas(pkg), alpm_pkg_get_filename(pkg), - pkgsize * MAX_DELTA_RATIO); - return unused; + pkg->size * MAX_DELTA_RATIO); } /** @} */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 487b56d..5678880 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -92,7 +92,6 @@ static time_t _pkg_get_builddate(alpm_pkg_t *pkg) { return pkg->builddate static time_t _pkg_get_installdate(alpm_pkg_t *pkg) { return pkg->installdate; } static const char *_pkg_get_packager(alpm_pkg_t *pkg) { return pkg->packager; } static const char *_pkg_get_arch(alpm_pkg_t *pkg) { return pkg->arch; } -static off_t _pkg_get_size(alpm_pkg_t *pkg) { return pkg->size; } static off_t _pkg_get_isize(alpm_pkg_t *pkg) { return pkg->isize; } static alpm_pkgreason_t _pkg_get_reason(alpm_pkg_t *pkg) { return pkg->reason; } static int _pkg_has_scriptlet(alpm_pkg_t *pkg) { return pkg->scriptlet; } @@ -138,7 +137,6 @@ struct pkg_operations default_pkg_ops = { .get_installdate = _pkg_get_installdate, .get_packager = _pkg_get_packager, .get_arch = _pkg_get_arch, - .get_size = _pkg_get_size, .get_isize = _pkg_get_isize, .get_reason = _pkg_get_reason, .has_scriptlet = _pkg_has_scriptlet, @@ -258,8 +256,7 @@ const char SYMEXPORT *alpm_pkg_get_arch(alpm_pkg_t *pkg) off_t SYMEXPORT alpm_pkg_get_size(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return -1); - pkg->handle->pm_errno = 0; - return pkg->ops->get_size(pkg); + return pkg->size; } off_t SYMEXPORT alpm_pkg_get_isize(alpm_pkg_t *pkg) diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 5962b1d..4680375 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -49,7 +49,6 @@ struct pkg_operations { time_t (*get_installdate) (alpm_pkg_t *); const char *(*get_packager) (alpm_pkg_t *); const char *(*get_arch) (alpm_pkg_t *); - off_t (*get_size) (alpm_pkg_t *); off_t (*get_isize) (alpm_pkg_t *); alpm_pkgreason_t (*get_reason) (alpm_pkg_t *); int (*has_scriptlet) (alpm_pkg_t *); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 023ad62..7106faf 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -304,24 +304,23 @@ static int compute_download_size(alpm_pkg_t *newpkg) size = 0; } else if(handle->usedelta) { off_t dltsize; - off_t pkgsize = alpm_pkg_get_size(newpkg); dltsize = _alpm_shortest_delta_path(handle, alpm_pkg_get_deltas(newpkg), alpm_pkg_get_filename(newpkg), &newpkg->delta_path); - if(newpkg->delta_path && (dltsize < pkgsize * MAX_DELTA_RATIO)) { + if(newpkg->delta_path && (dltsize < newpkg->size * MAX_DELTA_RATIO)) { _alpm_log(handle, ALPM_LOG_DEBUG, "using delta size\n"); size = dltsize; } else { _alpm_log(handle, ALPM_LOG_DEBUG, "using package size\n"); - size = alpm_pkg_get_size(newpkg); + size = newpkg->size; alpm_list_free(newpkg->delta_path); newpkg->delta_path = NULL; } } else { - size = alpm_pkg_get_size(newpkg); + size = newpkg->size; } _alpm_log(handle, ALPM_LOG_DEBUG, "setting download size %jd for pkg %s\n", @@ -833,7 +832,7 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas) ASSERT(spkg->filename != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1)); CALLOC(payload, 1, sizeof(*payload), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); STRDUP(payload->remote_name, spkg->filename, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - payload->max_size = alpm_pkg_get_size(spkg); + payload->max_size = spkg->size; files = alpm_list_add(files, payload); } @@ -916,7 +915,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) for(i = trans->add; i; i = i->next, current++) { alpm_pkg_t *spkg = i->data; if(spkg->origin != PKG_FROM_FILE) { - total_bytes += alpm_pkg_get_size(spkg); + total_bytes += spkg->size; } } /* this can only happen maliciously */ @@ -942,7 +941,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) continue; /* pkg_load() has been already called, this package is valid */ } - current_bytes += alpm_pkg_get_size(spkg); + current_bytes += spkg->size; filename = alpm_pkg_get_filename(spkg); filepath = _alpm_filecache_find(handle, filename); alpm_db_t *sdb = alpm_pkg_get_db(spkg); -- 1.7.6

1 0

[pacman-dev] [PATCH 1/2] pacman-key: split keyserver to a separate option
by Dan McGee 01 Sep '11

01 Sep '11

This also renames '--receive' to '-recv-keys' to match the wrapped gpg option name, rather than invent a new one, now that the calling convention is the same. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/pacman-key.8.txt | 10 ++++++++-- scripts/pacman-key.sh.in | 29 +++++++++++++++-------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 7481ce5..824f0b3 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -71,6 +71,12 @@ Options Ensure the keyring is properly initialized and has the required access permissions. +*\--keyserver* <keyserver>:: + Use the specified keyserver if the operation requires one. This will take + precedence over any keyserver option specified in a `gpg.conf` + configuration file. Running '\--init' with this option will set the default + keyserver if one was not already configured. + *-l, \--list-keys* [keyid(s)]:: Lists all or specified keys from the public keyring. @@ -81,8 +87,8 @@ Options Locally sign the given key. This is primarily used to root the web of trust in the local private key generated by '\--init'. -*-r, \--receive* <keyserver> <keyid(s)>:: - Fetch the specified keyid(s) from the specified key server URL. +*-r, \--recv-keys* <keyid(s)>:: + Equivalent to '\--recv-keys' in GnuPG. *\--populate* [keyring(s)]:: Reload the default keys from the (optionally provided) keyrings in diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 9bb8182..ce95f5d 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -35,6 +35,7 @@ FINGER=0 IMPORT=0 IMPORT_TRUSTDB=0 INIT=0 +KEYSERVER='' LISTKEYS=0 LISTSIGS=0 LSIGNKEY=0 @@ -43,6 +44,8 @@ RECEIVE=0 UPDATEDB=0 VERIFY=0 +DEFAULT_KEYSERVER='hkp://keys.gnupg.net' + m4_include(library/output_format.sh) m4_include(library/parse_options.sh) @@ -61,7 +64,7 @@ usage() { echo "$(gettext " -f, --finger [keyid(s)] List fingerprint for specified or all keyids")" echo "$(gettext " -h, --help Show this help message and exit")" echo "$(gettext " -l, --list-keys [keyid(s)] List the specified or all keys")" - echo "$(gettext " -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids")" + echo "$(gettext " -r, --recv-keys <keyid(s)> Fetch the specified keyids")" echo "$(gettext " -u, --updatedb Update the trustdb of pacman")" echo "$(gettext " -v, --verify <signature> Verify the file specified by the signature")" echo "$(gettext " -V, --version Show program version")" @@ -73,6 +76,7 @@ usage() { echo "$(gettext " --import <dir(s)> Imports pubring.gpg and trustdb.gpg from dir(s)")" echo "$(gettext " --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir(s)")" echo "$(gettext " --init Ensure the keyring is properly initialized")" + echo "$(gettext " --keyserver Specify a keyserver to use if necessary")" echo "$(gettext " --list-sigs [keyid(s)] List keys and their signatures")" echo "$(gettext " --lsign-key <keyid> Locally sign the specified keyid")" printf "$(gettext " --populate [keyring(s)] Reload the default keys from the (given) keyrings\n\ @@ -136,7 +140,7 @@ add_gpg_conf_option() { } initialize() { - local conffile + local conffile keyserv # Check for simple existence rather than for a directory as someone # may want to use a symlink here [[ -e ${PACMAN_KEYRING_DIR} ]] || mkdir -p -m 755 "${PACMAN_KEYRING_DIR}" @@ -155,7 +159,8 @@ initialize() { add_gpg_conf_option "$conffile" 'no-greeting' add_gpg_conf_option "$conffile" 'no-permission-warning' add_gpg_conf_option "$conffile" 'lock-never' - add_gpg_conf_option "$conffile" 'keyserver' 'hkp://keys.gnupg.net' + keyserv=${KEYSERVER:-$DEFAULT_KEYSERVER} + add_gpg_conf_option "$conffile" 'keyserver' "$keyserv" # set up a private signing key (if none available) if [[ $(secret_keys_available) -lt 1 ]]; then @@ -304,14 +309,6 @@ populate_keyring() { fi } -receive_keys() { - if [[ -z ${KEYIDS[@]} ]]; then - error "$(gettext "You need to specify the keyserver and at least one key identifier")" - exit 1 - fi - "${GPG_PACMAN[@]}" --keyserver "$KEYSERVER" --recv-keys "${KEYIDS[@]}" -} - edit_keys() { local errors=0; for key in ${KEYIDS[@]}; do @@ -366,7 +363,7 @@ fi OPT_SHORT="a::d:e:f::hl::r:uv:V" OPT_LONG="add::,config:,delete:,edit-key:,export::,finger::,gpgdir:" OPT_LONG+=",help,import:,import-trustdb:,init,list-keys::,list-sigs::" -OPT_LONG+=",lsign-key:,populate::,receive:,updatedb,verify:,version" +OPT_LONG+=",lsign-key:,populate::,recv-keys:,updatedb,verify:,version" if ! OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@")"; then echo; usage; exit 1 # E_INVALID_OPTION; fi @@ -390,11 +387,12 @@ while true; do --import) IMPORT=1; shift; IMPORT_DIRS=($1); UPDATEDB=1 ;; --import-trustdb) IMPORT_TRUSTDB=1; shift; IMPORT_DIRS=($1); UPDATEDB=1 ;; --init) INIT=1 ;; + --keyserver) shift; KEYSERVER=$1 ;; -l|--list-keys) LISTKEYS=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; --list-sigs) LISTSIGS=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; --lsign-key) LSIGNKEY=1; shift; KEYIDS=($1); UPDATEDB=1 ;; --populate) POPULATE=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYRINGIDS=($1); UPDATEDB=1 ;; - -r|--receive) RECEIVE=1; shift; TMP=($1); KEYSERVER=${TMP[0]}; KEYIDS=(${TMP[@]:1}); unset TMP; UPDATEDB=1 ;; + -r|--recv-keys) RECEIVE=1; shift; KEYIDS=($1); UPDATEDB=1 ;; -u|--updatedb) UPDATEDB=1 ;; -v|--verify) VERIFY=1; shift; SIGNATURE=$1 ;; @@ -429,6 +427,9 @@ fi PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(get_from "$CONFIG" "GPGDir" || echo "@sysconfdir@/pacman.d/gnupg")} GPG_PACMAN=(gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning) +if [[ -n ${KEYSERVER} ]]; then + GPG_PACMAN+=(--keyserver ${KEYSERVER}) +fi # check only a single operation has been given # don't include UPDATEDB in here as other opts can induce it @@ -464,7 +465,7 @@ esac # TODO: we can't do --batch on lsign until we figure out --command-fd (( LSIGNKEY )) && "${GPG_PACMAN[@]}" --lsign-key "${KEYIDS[@]}" (( POPULATE )) && populate_keyring -(( RECEIVE )) && receive_keys +(( RECEIVE )) && "${GPG_PACMAN[@]}" --recv-keys "${KEYIDS[@]}" (( VERIFY )) && "${GPG_PACMAN[@]}" --verify $SIGNATURE if (( UPDATEDB )); then -- 1.7.6

3 4

[pacman-dev] [PATCH 1/3] pacman-key: document --lsign-key
by Dan McGee 01 Sep '11

01 Sep '11

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/pacman-key.8.txt | 4 ++++ scripts/pacman-key.sh.in | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 3582b99..4201107 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -77,6 +77,10 @@ Options *--list-sigs* [keyid(s)]:: Same as --list-keys, but the signatures are listed too. +*\--lsign-key* <keyid>:: + Locally sign the given key. This is primarily used to root the web of trust + in the local private key generated by \--init. + *-r, \--receive* <keyserver> <keyid(s)>:: Fetch the specified keyids from the specified key server URL. diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 14ea07d..b469fd3 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -74,6 +74,7 @@ usage() { echo "$(gettext " --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir(s)")" echo "$(gettext " --init Ensure the keyring is properly initialized")" echo "$(gettext " --list-sigs [<keyid(s)>] List keys and their signatures")" + echo "$(gettext " --lsign-key <keyid> Locally sign the specified keyid")" printf "$(gettext " --populate [<keyring(s)] Reload the default keys from the (given) keyrings\n\ in '%s'")\n" "@pkgdatadir@/keyrings" } -- 1.7.6

1 1

[pacman-dev] [PATCH] pactest: remove PACMAN_OUTPUT from ldconfig tests
by Dan McGee 01 Sep '11

01 Sep '11

This removes the last usages of this rule that aren't explicitly looking at real output from pacman. Notably, these tests depended on one particular debug logger not ever being changed, which is too fragile, not to mention doesn't work at all with --nolog. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- test/pacman/ldconfig.stub | 4 ++++ test/pacman/pmtest.py | 7 ++++++- test/pacman/tests/ldconfig001.py | 9 +++------ test/pacman/tests/ldconfig002.py | 7 ++----- test/pacman/tests/ldconfig003.py | 7 +------ test/pacman/util.py | 1 + 6 files changed, 17 insertions(+), 18 deletions(-) create mode 100755 test/pacman/ldconfig.stub diff --git a/test/pacman/ldconfig.stub b/test/pacman/ldconfig.stub new file mode 100755 index 0000000..d261a04 --- /dev/null +++ b/test/pacman/ldconfig.stub @@ -0,0 +1,4 @@ +#!/bin/sh +# A simple stub to copy into the chroot to fake ldconfig. +# Simply appends a line to /etc/ld.so.cache if called. +echo "ldconfig called" >> /etc/ld.so.cache diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 3acf5d8..4e1ecd0 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -119,13 +119,18 @@ def generate(self): logdir = os.path.join(self.root, os.path.dirname(util.LOGFILE)) etcdir = os.path.join(self.root, os.path.dirname(util.PACCONF)) bindir = os.path.join(self.root, "bin") - sys_dirs = [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir] + sbindir = os.path.join(self.root, "sbin") + sys_dirs = [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir, sbindir] for sys_dir in sys_dirs: if not os.path.isdir(sys_dir): vprint("\t%s" % sys_dir[len(self.root)+1:]) os.makedirs(sys_dir, 0755) # Only the dynamically linked binary is needed for fakechroot shutil.copy("/bin/sh", bindir) + shutil.copy(os.path.join(util.SELFPATH, "ldconfig.stub"), + os.path.join(sbindir, "ldconfig")) + ld_so_conf = open(os.path.join(etcdir, "ld.so.conf"), "w") + ld_so_conf.close() # Configuration file vprint(" Creating configuration file") diff --git a/test/pacman/tests/ldconfig001.py b/test/pacman/tests/ldconfig001.py index aa029ba..a264326 100644 --- a/test/pacman/tests/ldconfig001.py +++ b/test/pacman/tests/ldconfig001.py @@ -1,12 +1,9 @@ -# quick note here - chroot() is expected to fail. We're not checking the -# validity of the scripts, only that they fire (or try to) -self.description = "Make sure ldconfig runs on an add operation" +self.description = "Make sure ldconfig runs on an upgrade operation" p = pmpkg("dummy") self.addpkg(p) -# --debug is necessary to check PACMAN_OUTPUT -self.args = "--debug -U %s" % p.filename() +self.args = "-U %s" % p.filename() self.addrule("PACMAN_RETCODE=0") -self.addrule("PACMAN_OUTPUT=running ldconfig") +self.addrule("FILE_EXIST=/etc/ld.so.cache") diff --git a/test/pacman/tests/ldconfig002.py b/test/pacman/tests/ldconfig002.py index c028ce3..2628dc7 100644 --- a/test/pacman/tests/ldconfig002.py +++ b/test/pacman/tests/ldconfig002.py @@ -1,5 +1,3 @@ -# quick note here - chroot() is expected to fail. We're not checking the -# validity of the scripts, only that they fire (or try to) self.description = "Make sure ldconfig runs on an upgrade operation" lp = pmpkg("dummy") @@ -8,9 +6,8 @@ p = pmpkg("dummy", "1.0-2") self.addpkg(p) -# --debug is necessary to check PACMAN_OUTPUT -self.args = "--debug -U %s" % p.filename() +self.args = "-U %s" % p.filename() self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-2") -self.addrule("PACMAN_OUTPUT=running ldconfig") +self.addrule("FILE_EXIST=/etc/ld.so.cache") diff --git a/test/pacman/tests/ldconfig003.py b/test/pacman/tests/ldconfig003.py index 69618c6..8d1babb 100644 --- a/test/pacman/tests/ldconfig003.py +++ b/test/pacman/tests/ldconfig003.py @@ -1,5 +1,3 @@ -# quick note here - chroot() is expected to fail. We're not checking the -# validity of the scripts, only that they fire (or try to) self.description = "Make sure ldconfig runs on a sync operation" sp = pmpkg("dummy") @@ -7,8 +5,5 @@ self.args = "-S %s" % sp.name -# --debug is necessary to check PACMAN_OUTPUT -self.args = "--debug -S %s" % sp.name - self.addrule("PACMAN_RETCODE=0") -self.addrule("PACMAN_OUTPUT=running ldconfig") +self.addrule("FILE_EXIST=/etc/ld.so.cache") diff --git a/test/pacman/util.py b/test/pacman/util.py index cde44c6..81dcc90 100644 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -20,6 +20,7 @@ import re import hashlib +SELFPATH = os.path.abspath(os.path.dirname(__file__)) # ALPM PM_ROOT = "/" -- 1.7.6

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-144-gad051f7
by dan＠archlinux.org 01 Sep '11

01 Sep '11

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 ad051f7328cb8fed19070651aac314d64de1b815 (commit) via 13072ef86ca8d9b3eb5b06c21211dc98d5a21732 (commit) via 11873b70ae346d06da8590f6bd4bfc19577a8840 (commit) via 11ab9aa9f5f0f3873df89c73e8715b82f485bd9b (commit) via cf1f0143935fe62ebb568202ff83ba2de0815995 (commit) via 5bb2d2e0a0c9edf03273fc00aa9e3a5cdff13310 (commit) via 35d8cc8bc8ae94fcdde1bc04a3276a73e41660ec (commit) via 50f53b293c0ff823065e7a98d288787ca7bd4ba9 (commit) via 7479bf21e85c118067351769cdc9f1fd589ac4dc (commit) via 06b228b20fff23500e5bb9bc8cdf96a86ca244e8 (commit) via 19c3880ec9e7b373000b10e230217a733d1c1a24 (commit) via 2c5f000d5b2fd5db3b70670b835e6b932c0d10e3 (commit) from 234b6ffc2c39268d1efdc414e02bc4b352e5d931 (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 ad051f7328cb8fed19070651aac314d64de1b815 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 12:36:11 2011 -0500 _alpm_parsedate(): return time_t and not long Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 13072ef86ca8d9b3eb5b06c21211dc98d5a21732 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 12:06:32 2011 -0500 Add pactest for overflowing date (year 2038 problem) This will work fine on x86_64 (or any platform that has a 64 bit long), but currently fails on i686. This test also stresses the recent changes to accommodate package size values greater than a 32 bit UINT_MAX. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 11873b70ae346d06da8590f6bd4bfc19577a8840 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 11:42:55 2011 -0500 makepkg: fix overzealous PGP signature file matching The regex wasn't rooted at the end of the filename, nor was it matching a period/dot before the file extension. The end result was this matched a file named '07_all_sig.patch' which is totally broken. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 11ab9aa9f5f0f3873df89c73e8715b82f485bd9b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Aug 30 09:24:28 2011 -0400 pacman/callback: reuse strlen calculation Call strlen earlier in the dl progress callback, and reuse this length to replace some heavier str*() calls with more optimized mem*() replacements. This also gets rid of a false assumption that the ending string will ever be longer than the original string. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cf1f0143935fe62ebb568202ff83ba2de0815995 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Aug 30 11:01:37 2011 -0400 makepkg: fix sanity checking in versioning Read the entire variable, respecting escapes, which are necessary to retain for the successive eval. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5bb2d2e0a0c9edf03273fc00aa9e3a5cdff13310 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Aug 30 10:31:49 2011 -0400 makepkg: read filenames in a while loop Further improvments on 2ca27ab which will allow the changelog and install script files to contain whitespace. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 35d8cc8bc8ae94fcdde1bc04a3276a73e41660ec Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Aug 22 20:50:17 2011 -0400 makepkg: fix breakage in eval'ing quoted strings Broken in 2ca27a by me, trying to fix another problem. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 50f53b293c0ff823065e7a98d288787ca7bd4ba9 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 29 12:52:51 2011 -0500 pacman-key: add --lsign-key operation This allows local signing of a given key to help establish the web of trust rooted at the generated (or imported) master key. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7479bf21e85c118067351769cdc9f1fd589ac4dc Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 18:39:11 2011 -0500 pacman-key master key generation This enables pacman-key, during --init, to generate a single secret key for the pacman keyring if one is not present. This will be used as the root of the web of trust for those that do not wish to manage it with their own key, as will be the default. This does not preclude later adding other secret keys to the keyring, or removing this one- we simply ensure you have at least one secret key available. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 06b228b20fff23500e5bb9bc8cdf96a86ca244e8 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 29 16:27:00 2011 -0500 Scale package integrity progress bar/percentage by package size This upgrades the simple 15/17 scaling by package number we used before to package sized based scaling, which is much more accurate. Addresses some of the issues raised in FS#25817. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 19c3880ec9e7b373000b10e230217a733d1c1a24 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 30 22:01:13 2011 +1000 Remove outdated comment for _alpm_outerconflicts Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2c5f000d5b2fd5db3b70670b835e6b932c0d10e3 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Tue Aug 30 00:58:48 2011 +0800 Improve advice for sync ops when db.lck is present When the database is locked, sync operations involving transactions, such as pacman -Syy, show the following: :: Synchronizing package databases... error: failed to update core (unable to lock database) error: failed to update extra (unable to lock database) error: failed to update community (unable to lock database) error: failed to update multilib (unable to lock database) error: failed to synchronize any databases Whereas pacman -U <pkg> shows: error: failed to init transaction (unable to lock database) if you're sure a package manager is not already running, you can remove /var/lib/pacman/db.lck Which is much more meaningful, since the presence of db.lck may indicate an erroneous lockfile instead of an ongoing transaction. Improve the error messages for sync operations by advising the user to remove db.lck if he is sure that no package manager is running. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/conflict.c | 5 +--- lib/libalpm/sync.c | 19 ++++++++++++++++- lib/libalpm/util.c | 4 +- lib/libalpm/util.h | 2 +- scripts/makepkg.sh.in | 30 +++++++++++++--------------- scripts/pacman-key.sh.in | 42 ++++++++++++++++++++++++++++++++++++++-- src/pacman/callback.c | 23 ++++++++++++--------- src/pacman/sync.c | 1 + src/pacman/util.c | 22 ++++++++++++-------- src/pacman/util.h | 1 + test/pacman/tests/query002.py | 4 +- test/pacman/tests/query005.py | 4 +- test/pacman/tests/query006.py | 27 ++++++++++++++++++++++++++ 13 files changed, 133 insertions(+), 51 deletions(-) create mode 100644 test/pacman/tests/query006.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] Add pactest for overflowing date (year 2038 problem)
by Dan McGee 01 Sep '11

01 Sep '11

This will work fine on x86_64 (or any platform that has a 64 bit long), but currently fails on i686. This test also stresses the recent changes to accommodate package size values greater than a 32 bit UINT_MAX. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- test/pacman/tests/query002.py | 4 ++-- test/pacman/tests/query005.py | 4 ++-- test/pacman/tests/query006.py | 27 +++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 test/pacman/tests/query006.py diff --git a/test/pacman/tests/query002.py b/test/pacman/tests/query002.py index 72fd7c1..ccf18f4 100644 --- a/test/pacman/tests/query002.py +++ b/test/pacman/tests/query002.py @@ -1,4 +1,4 @@ -self.description = "Query info on a package" +self.description = "Query info on a package (old date)" p = pmpkg("foobar") p.files = ["bin/foobar"] @@ -18,4 +18,4 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=^Name.*%s" % p.name) self.addrule("PACMAN_OUTPUT=^Description.*%s" % p.desc) -self.addrule("PACMAN_OUTPUT=^Build Date.*2007") +self.addrule("PACMAN_OUTPUT=^Build Date.* 2007") diff --git a/test/pacman/tests/query005.py b/test/pacman/tests/query005.py index 23a78fc..06768b3 100644 --- a/test/pacman/tests/query005.py +++ b/test/pacman/tests/query005.py @@ -1,4 +1,4 @@ -self.description = "Query info on a package" +self.description = "Query info on a package (new date)" p = pmpkg("foobar") p.files = ["bin/foobar"] @@ -18,4 +18,4 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=^Name.*%s" % p.name) self.addrule("PACMAN_OUTPUT=^Description.*%s" % p.desc) -self.addrule("PACMAN_OUTPUT=^Build Date.*2007") +self.addrule("PACMAN_OUTPUT=^Build Date.* 2007") diff --git a/test/pacman/tests/query006.py b/test/pacman/tests/query006.py new file mode 100644 index 0000000..3668478 --- /dev/null +++ b/test/pacman/tests/query006.py @@ -0,0 +1,27 @@ +self.description = "Query info on a package (overflow long values)" + +p = pmpkg("overflow") +p.desc = "Overflow size and date values if possible" +p.url = "http://www.archlinux.org" +p.license = "GPL2" +p.arch = "i686" +p.packager = "Arch Linux" +# size is greater than 4294967295, aka UINT_MAX +p.size = "10000000000" +# build date is greater than 2147483647, aka INT_MAX +p.builddate = "3000000000" +# install date is greater than UINT_MAX +p.installdate = "10000000000" + +self.addpkg2db("local", p) + +self.args = "-Qi %s" % p.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=^Name.*%s" % p.name) +self.addrule("PACMAN_OUTPUT=^Description.*%s" % p.desc) +self.addrule("PACMAN_OUTPUT=^Installed Size.*9765625.00 KiB") +self.addrule("PACMAN_OUTPUT=^Build Date.* 2065") +self.addrule("PACMAN_OUTPUT=^Install Date.* 2286") + +self.expectfailure = True -- 1.7.6

1 1

[pacman-dev] [PATCH] makepkg: fix overzealous PGP signature file matching
by Dan McGee 01 Sep '11

01 Sep '11

The regex wasn't rooted at the end of the filename, nor was it matching a period/dot before the file extension. The end result was this matched a file named '07_all_sig.patch' which is totally broken. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e74e5c8..2f06b9b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -341,7 +341,7 @@ in_array() { source_has_signatures(){ local file for file in "${source[@]}"; do - if [[ $file =~ .*(sig|asc) ]]; then + if [[ $file =~ \.(sig|asc)$ ]]; then return 0 fi done @@ -709,7 +709,7 @@ check_pgpsigs() { for file in "${source[@]}"; do file="$(get_filename "$file")" - if [[ ! $file =~ .*(sig|asc) ]]; then + if [[ ! $file =~ \.(sig|asc)$ ]]; then continue fi -- 1.7.6

1 0

[pacman-dev] [PATCH 0/3] Add --verifylvl option to pacman
by Pang Yan Han 30 Aug '11

30 Aug '11

This is a reroll of a series to add the --verifylvl option to pacman, taking into account of the recent changes in libalpm. The --verifylvl option can be used to change pacman's signature verification level to one of "always", "optional", or "never". Patch 1/3 changes option_verifysig to accept non-capitalized versions of "Always", "Optional" and "Never". Patch 2/3 adds the --verifylvl to pacman. Patch 3/3 adds the "VerifySig" option to etc/pacman.conf.in Pang Yan Han (3): option_verifysig: Accept non-caps sig levels pacman: Add --verifylvl option etc/pacman.conf.in : Add VerifySig option doc/pacman.8.txt | 7 +++++++ etc/pacman.conf.in | 1 + src/pacman/conf.c | 15 ++++++++++++--- src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 6 ++++++ 5 files changed, 29 insertions(+), 4 deletions(-) -- 1.7.6.rc0

3 6

[pacman-dev] [PATCH v2] Improve advice for sync ops when db.lck is present
by Pang Yan Han 30 Aug '11

30 Aug '11

When the database is locked, sync operations involving transactions, such as pacman -Syy, show the following: :: Synchronizing package databases... error: failed to update core (unable to lock database) error: failed to update extra (unable to lock database) error: failed to update community (unable to lock database) error: failed to update multilib (unable to lock database) error: failed to synchronize any databases Whereas pacman -U <pkg> shows: error: failed to init transaction (unable to lock database) if you're sure a package manager is not already running, you can remove /var/lib/pacman/db.lck Which is much more meaningful, since the presence of db.lck may indicate an erroneous lockfile instead of an ongoing transaction. Improve the error messages for sync operations by advising the user to remove db.lck if he is sure that no package manager is running. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- src/pacman/sync.c | 1 + src/pacman/util.c | 22 +++++++++++++--------- src/pacman/util.h | 1 + 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index e97da37..d553ba0 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -304,6 +304,7 @@ static int sync_synctree(int level, alpm_list_t *syncs) */ if(!success) { pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to synchronize any databases\n")); + trans_init_error(); } return (success > 0); } diff --git a/src/pacman/util.c b/src/pacman/util.c index 47fbaeb..599c18c 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -63,20 +63,24 @@ int trans_init(alpm_transflag_t flags, int check_valid) } if(ret == -1) { - enum _alpm_errno_t err = alpm_errno(config->handle); - pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to init transaction (%s)\n"), - alpm_strerror(err)); - if(err == ALPM_ERR_HANDLE_LOCK) { - fprintf(stderr, _(" if you're sure a package manager is not already\n" - " running, you can remove %s\n"), - alpm_option_get_lockfile(config->handle)); - } - + trans_init_error(); return -1; } return 0; } +void trans_init_error(void) +{ + enum _alpm_errno_t err = alpm_errno(config->handle); + pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to init transaction (%s)\n"), + alpm_strerror(err)); + if(err == ALPM_ERR_HANDLE_LOCK) { + fprintf(stderr, _(" if you're sure a package manager is not already\n" + " running, you can remove %s\n"), + alpm_option_get_lockfile(config->handle)); + } +} + int trans_release(void) { if(alpm_trans_release(config->handle) == -1) { diff --git a/src/pacman/util.h b/src/pacman/util.h index 6669847..6a26b08 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -39,6 +39,7 @@ /* update speed for the fill_progress based functions */ #define UPDATE_SPEED_SEC 0.2f +void trans_init_error(void); int trans_init(alpm_transflag_t flags, int check_valid); int trans_release(void); int needs_root(void); -- 1.7.6.1.385.gb7fcd0

2 1