October 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH v3] Indicate ignored packages in -Qu output
by Allan McRae 16 Oct '13

16 Oct '13

Add "[ignored]" in the "pacman -Qu" output after packages that have their upgrades ignored. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/query.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pacman/query.c b/src/pacman/query.c index bd50b05..8814307 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -324,6 +324,10 @@ static int display(alpm_pkg_t *pkg) if(config->op_q_upgrade) { alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle)); printf(" -> %s%s%s", colstr->version, alpm_pkg_get_version(newpkg), colstr->nocolor); + + if(alpm_pkg_should_ignore(config->handle, pkg)) { + printf(" %s", _("[ignored]")); + } } printf("\n"); -- 1.8.4

1 0

[pacman-dev] [PATCH] Expose alpm_pkg_should_ignore
by Allan McRae 16 Oct '13

16 Oct '13

This function is useful for frontends to annotate package upgrades that will be ignored. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 9 +++++++++ lib/libalpm/deps.c | 4 ++-- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 1 - lib/libalpm/sync.c | 14 +++++++------- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 29b9f37..2c8c1e6 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -793,6 +793,15 @@ alpm_list_t *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg); */ alpm_list_t *alpm_pkg_compute_optionalfor(alpm_pkg_t *pkg); +/** Test if a package should be ignored. + * Checks if the package is ignored via IgnorePkg, or if the package is + * in a group ignored via IgnoreGroup. + * @param handle the context handle + * @param pkg the package to test + * @return 1 if the package should be ignored, 0 otherwise + */ +int alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg); + /** @name Package Property Accessors * Any pointer returned by these functions points to internal structures * allocated by libalpm. They should not be freed nor modified in any diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 745eac1..cf7605e 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -664,7 +664,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, pkg = _alpm_db_get_pkgfromcache(db, dep->name); if(pkg && _alpm_depcmp_literal(pkg, dep) && !alpm_pkg_find(excluding, pkg->name)) { - if(_alpm_pkg_should_ignore(handle, pkg)) { + if(alpm_pkg_should_ignore(handle, pkg)) { int install = 0; if(prompt) { QUESTION(handle, ALPM_QUESTION_INSTALL_IGNOREPKG, pkg, @@ -693,7 +693,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, * possibly be the same string */ if(pkg->name_hash != dep->name_hash && _alpm_depcmp(pkg, dep) && !alpm_pkg_find(excluding, pkg->name)) { - if(_alpm_pkg_should_ignore(handle, pkg)) { + if(alpm_pkg_should_ignore(handle, pkg)) { int install = 0; if(prompt) { QUESTION(handle, ALPM_QUESTION_INSTALL_IGNOREPKG, diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index cfdbb3f..1294f8e 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -753,7 +753,7 @@ alpm_pkg_t SYMEXPORT *alpm_pkg_find(alpm_list_t *haystack, const char *needle) * * @return 1 if the package should be ignored, 0 otherwise */ -int _alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg) +int SYMEXPORT alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg) { alpm_list_t *groups = NULL; diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index b7c3358..07b043c 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -148,7 +148,6 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, int _alpm_pkg_cmp(const void *p1, const void *p2); int _alpm_pkg_compare_versions(alpm_pkg_t *local_pkg, alpm_pkg_t *pkg); -int _alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg); #endif /* _ALPM_PACKAGE_H */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index a4b1bb8..066f1f2 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -93,8 +93,8 @@ static int check_literal(alpm_handle_t *handle, alpm_pkg_t *lpkg, _alpm_log(handle, ALPM_LOG_DEBUG, "new version of '%s' found (%s => %s)\n", lpkg->name, lpkg->version, spkg->version); /* check IgnorePkg/IgnoreGroup */ - if(_alpm_pkg_should_ignore(handle, spkg) - || _alpm_pkg_should_ignore(handle, lpkg)) { + if(alpm_pkg_should_ignore(handle, spkg) + || alpm_pkg_should_ignore(handle, lpkg)) { _alpm_log(handle, ALPM_LOG_WARNING, _("%s: ignoring package upgrade (%s => %s)\n"), lpkg->name, lpkg->version, spkg->version); } else { @@ -105,8 +105,8 @@ static int check_literal(alpm_handle_t *handle, alpm_pkg_t *lpkg, } else if(cmp < 0) { if(enable_downgrade) { /* check IgnorePkg/IgnoreGroup */ - if(_alpm_pkg_should_ignore(handle, spkg) - || _alpm_pkg_should_ignore(handle, lpkg)) { + if(alpm_pkg_should_ignore(handle, spkg) + || alpm_pkg_should_ignore(handle, lpkg)) { _alpm_log(handle, ALPM_LOG_WARNING, _("%s: ignoring package downgrade (%s => %s)\n"), lpkg->name, lpkg->version, spkg->version); } else { @@ -148,8 +148,8 @@ static alpm_list_t *check_replacers(alpm_handle_t *handle, alpm_pkg_t *lpkg, int doreplace = 0; alpm_pkg_t *tpkg; /* check IgnorePkg/IgnoreGroup */ - if(_alpm_pkg_should_ignore(handle, spkg) - || _alpm_pkg_should_ignore(handle, lpkg)) { + if(alpm_pkg_should_ignore(handle, spkg) + || alpm_pkg_should_ignore(handle, lpkg)) { _alpm_log(handle, ALPM_LOG_WARNING, _("ignoring package replacement (%s-%s => %s-%s)\n"), lpkg->name, lpkg->version, spkg->name, spkg->version); @@ -270,7 +270,7 @@ alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs, if(alpm_pkg_find(ignorelist, pkg->name)) { continue; } - if(_alpm_pkg_should_ignore(db->handle, pkg)) { + if(alpm_pkg_should_ignore(db->handle, pkg)) { ignorelist = alpm_list_add(ignorelist, pkg); int install = 0; QUESTION(db->handle, ALPM_QUESTION_INSTALL_IGNOREPKG, pkg, -- 1.8.4

1 0

[pacman-dev] [PATCH v2] Indicate ignored packages in -Qu output
by Allan McRae 16 Oct '13

16 Oct '13

Add "[ignored]" in the "pacman -Qu" output after packages that have their upgrades ignored. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v2: check IgnoreGroup too. src/pacman/query.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index bd50b05..77e783c 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -317,13 +317,33 @@ static int display(alpm_pkg_t *pkg) if(!config->op_q_info && !config->op_q_list && !config->op_q_changelog && !config->op_q_check) { if(!config->quiet) { + const char *pkgname = alpm_pkg_get_name(pkg); const colstr_t *colstr = &config->colstr; - printf("%s%s %s%s%s", colstr->title, alpm_pkg_get_name(pkg), + + printf("%s%s %s%s%s", colstr->title, pkgname, colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); if(config->op_q_upgrade) { alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle)); + int ignored = 0; + printf(" -> %s%s%s", colstr->version, alpm_pkg_get_version(newpkg), colstr->nocolor); + + /* check if package or package group is ignored */ + if(alpm_list_find_str(alpm_option_get_ignorepkgs(config->handle), pkgname)) { + ignored = 1; + } else { + const alpm_list_t *g; + for(g = alpm_pkg_get_groups(pkg); g; g = g->next) { + if(alpm_list_find_str(alpm_option_get_ignoregroups(config->handle), g->data)) { + ignored = 1; + } + } + } + + if(ignored == 1) { + printf(" %s", _("[ignored]")); + } } printf("\n"); -- 1.8.4

2 1

[pacman-dev] [PATCH] repo-add.8: Provide example usage
by Allan McRae 15 Oct '13

15 Oct '13

Detail the current standard of generating two databases - with and without the file list. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/repo-add.8.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index e51fadf..d44a8a7 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -82,6 +82,19 @@ repo-add Options Remove old package files from the disk when updating their entry in the database. +Example +------- + +'repo-add' is often invoked twice to create two separate databases; a smaller +database used by pacman and a large database containing package file lists for +use by other utilities. + +'repo-add' foo.db.tar.xz <pkg1> [<pkg2> ...] +'repo-add' -f foo.files.tar.xz <pkg1> [<pkg2> ...] + +While pacman can use the large database (if given a db.tar* extension), there +is currently no additional benefit for the larger download. + See Also -------- linkman:makepkg[8], linkman:pacman[8], linkman:pkgdelta[8] -- 1.8.4

1 0

[pacman-dev] [PATCH] makepkg.8: document environmental variables that affect gpg signing
by Allan McRae 15 Oct '13

15 Oct '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Replaces patch sent with just GNUPGHOME documented. doc/makepkg.8.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 448d447..d047aee 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -236,6 +236,13 @@ Environment Variables Force build for a specific architecture. Useful for cross-compiling. Overrides the corresponding value defined in linkman:makepkg.conf[5]. +**GNUPGHOME=**"/path/to/folder":: + Folder where the gpg keyring for signing the built package is stored. + +**GPGKEY=**"keyid":: + Specify a key to use when signing packages, overriding the GPGKEY setting + in linkman:makepkg.conf[5] + Configuration ------------- See linkman:makepkg.conf[5] for more details on configuring makepkg using the -- 1.8.4

1 0

[pacman-dev] [PATCH] doc: note use of GNUPGHOME to select keyring for signing packages
by Allan McRae 15 Oct '13

15 Oct '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.8.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 448d447..1687fc3 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -236,6 +236,9 @@ Environment Variables Force build for a specific architecture. Useful for cross-compiling. Overrides the corresponding value defined in linkman:makepkg.conf[5]. +**GNUPGHOME=**"/path/to/folder":: + Folder where the gpg keyring for signing the built package is stored. + Configuration ------------- See linkman:makepkg.conf[5] for more details on configuring makepkg using the -- 1.8.4

1 0

[pacman-dev] [PATCH] Fix detection of joint --native and --foreign usage
by Allan McRae 15 Oct '13

15 Oct '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/pacman.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index f485692..f22f40f 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -600,7 +600,8 @@ static void checkargs_query(void) } invalid_opt(config->op_q_deps && config->op_q_explicit, "--deps", "--explicit"); - invalid_opt(config->op_q_locality & (PKG_LOCALITY_NATIVE | PKG_LOCALITY_FOREIGN), + invalid_opt((config->op_q_locality & PKG_LOCALITY_NATIVE) && + (config->op_q_locality & PKG_LOCALITY_FOREIGN), "--native", "--foreign"); } -- 1.8.4

1 0

[pacman-dev] [PATCH 1/2] Make functions to decode a signature and extract keyid public
by Allan McRae 15 Oct '13

15 Oct '13

These are useful for frontends. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 6 ++++++ lib/libalpm/be_package.c | 2 +- lib/libalpm/signing.c | 6 +++--- lib/libalpm/signing.h | 5 ----- lib/libalpm/sync.c | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b049007..29b9f37 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1075,6 +1075,12 @@ int alpm_db_check_pgp_signature(alpm_db_t *db, alpm_siglist_t *siglist); int alpm_siglist_cleanup(alpm_siglist_t *siglist); +int alpm_decode_signature(const char *base64_data, + unsigned char **data, size_t *data_len); + +int alpm_extract_keyid(alpm_handle_t *handle, const char *identifier, + const unsigned char *sig, const size_t len, alpm_list_t **keys); + /* * Groups */ diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 526d927..3f577ba 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -570,7 +570,7 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful return -1; } - if(_alpm_extract_keyid(handle, filename, sig, len, &keys) == 0) { + if(alpm_extract_keyid(handle, filename, sig, len, &keys) == 0) { alpm_list_t *k; for(k = keys; k; k = k->next) { char *key = k->data; diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index a856f13..7e4d41b 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -425,7 +425,7 @@ int _alpm_key_import(alpm_handle_t *handle, const char *fpr) * @return 0 on success, -1 on failure to properly decode */ -int _alpm_decode_signature(const char *base64_data, +int SYMEXPORT alpm_decode_signature(const char *base64_data, unsigned char **data, size_t *data_len) { size_t len = strlen(base64_data); @@ -525,7 +525,7 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, if(base64_sig) { /* memory-based, we loaded it from a sync DB */ size_t data_len; - int decode_ret = _alpm_decode_signature(base64_sig, + int decode_ret = alpm_decode_signature(base64_sig, &decoded_sigdata, &data_len); if(decode_ret) { handle->pm_errno = ALPM_ERR_SIG_INVALID; @@ -964,7 +964,7 @@ int SYMEXPORT alpm_siglist_cleanup(alpm_siglist_t *siglist) * @param keys a pointer to storage for key IDs * @return 0 on success, -1 on error */ -int _alpm_extract_keyid(alpm_handle_t *handle, const char *identifier, +int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier, const unsigned char *sig, const size_t len, alpm_list_t **keys) { size_t pos, spos, blen, hlen, ulen, slen; diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index 2d49240..42b60b1 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -34,11 +34,6 @@ int _alpm_process_siglist(alpm_handle_t *handle, const char *identifier, int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr); int _alpm_key_import(alpm_handle_t *handle, const char *fpr); -int _alpm_decode_signature(const char *base64_data, - unsigned char **data, size_t *data_len); -int _alpm_extract_keyid(alpm_handle_t *handle, const char *identifier, - const unsigned char *sig, const size_t len, alpm_list_t **keys); - #endif /* _ALPM_SIGNING_H */ /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 9081c73..a4b1bb8 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1007,11 +1007,11 @@ static int check_keyring(alpm_handle_t *handle) if((level & ALPM_SIG_PACKAGE) && pkg->base64_sig) { unsigned char *decoded_sigdata = NULL; size_t data_len; - int decode_ret = _alpm_decode_signature(pkg->base64_sig, + int decode_ret = alpm_decode_signature(pkg->base64_sig, &decoded_sigdata, &data_len); if(decode_ret == 0) { alpm_list_t *keys = NULL; - if(_alpm_extract_keyid(handle, pkg->name, decoded_sigdata, + if(alpm_extract_keyid(handle, pkg->name, decoded_sigdata, data_len, &keys) == 0) { alpm_list_t *k; for(k = keys; k; k = k->next) { -- 1.8.4

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-172-g968486e
by allan＠archlinux.org 15 Oct '13

15 Oct '13

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 968486ecc0c20f3b075ad9b903b9df862621610a (commit) via e049bb8bd6bb3b8aacf371abde937d2270cfa451 (commit) via e7ad883ebe41a25a63f4349ea08d589ec48c3539 (commit) via c69d71d55bfab10c1d021a0db3efe793250f687a (commit) via fb0f880f0a19d0b1b0630472a8fce83fde9451f3 (commit) via dcfc247a2c56e31ed6d30e56ac982329c641f78d (commit) via 3e903d34cca81a73858309d6a9be289b422ec3b4 (commit) via 217aaaf3ea6d533ee77e4fad19d320c70a302382 (commit) via ed511b141f1680b52efe3338eb90a9598af0a4dd (commit) from e5f23e0ebb14be22623c38130e6c2b3c37954a2b (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 968486ecc0c20f3b075ad9b903b9df862621610a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 14 09:13:28 2013 -0400 makepkg: validate updated pkgver before replacement Validate the new pkgver efore blindly ramming it into the PKGBUILD. This gives us good feedback and prevents corrupting the PKGBUILD, e.g. ==> Starting pkgver()... ==> ERROR: pkgver is not allowed to contain colons, hyphens or whitespace. ==> ERROR: pkgver() generated an invalid version: a horse is not a pkgver As an additional failsafe, exchange a valid for invalid character as command separator in @SEDINPLACE@ expressions. For even more paranoia, exit if sed fails for any reason. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e049bb8bd6bb3b8aacf371abde937d2270cfa451 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 14 21:04:22 2013 +1000 Ensure packages have a valid version Currently you can manually create and then install a package with a version not containing a pkgrel. The created local database entry is invalid as the directory name can not be split by _alpm_splitname due to the assumtion of hyphens separating name-pkgver-pkgrel. Ensure the package has a valid version when it is loaded. Fixes FS#35514. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e7ad883ebe41a25a63f4349ea08d589ec48c3539 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 14 16:35:09 2013 +1000 makepkg: use source_safe when resourcing BUILDFILE After updating the pkgver, we still need to safely source the BUILDFILE. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c69d71d55bfab10c1d021a0db3efe793250f687a Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 14 16:12:00 2013 +1000 contrib/pacdiff: error if diffprog is not found FS#35936 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fb0f880f0a19d0b1b0630472a8fce83fde9451f3 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 14 15:55:39 2013 +1000 proto: remove missed $srcdir redundancies Most of the redundant "cd $srcdir" in the prototypes were removed in commit 5f80d7af. Fix the rest. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit dcfc247a2c56e31ed6d30e56ac982329c641f78d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 14 14:55:20 2013 +1000 Fix progress bar overflow while checking package integrity On 32bit systems, the progress bar intergrity checking can show values greater than 100% with large transactions. This is due to the total size of all package files being greater than a size_t. Use uint64_t for these sizes. Fixes FS#36608 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3e903d34cca81a73858309d6a9be289b422ec3b4 Author: Eric Toombs <ewtoombs(a)uwaterloo.ca> Date: Wed Sep 11 23:21:34 2013 -0400 Added list of mandatory options to PKGBUILD's man page [Allan: Adjust wording due to remove al license warning] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 217aaaf3ea6d533ee77e4fad19d320c70a302382 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 13 23:20:08 2013 -0400 autogen.sh: remove useless shell flag and subshells $ ./autogen.sh ./autogen.sh: 3: ./autogen.sh: BASH_SOURCE: parameter not set The -u flag causes this (and lots of other mysterious problems). Since there aren't even any variables in this script, it makes no sense to use it. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ed511b141f1680b52efe3338eb90a9598af0a4dd Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 21 20:00:11 2013 +1000 Report which package is missing a signature If any package in a sync transaction is missing a required signature, we give an uninformative error message (which may or may not state that the missing signature is the issue). Always output the package with the missing signature. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: autogen.sh | 6 ++++-- contrib/pacdiff.sh.in | 5 +++++ doc/PKGBUILD.5.txt | 4 +++- lib/libalpm/be_package.c | 4 ++++ lib/libalpm/sync.c | 13 +++++++++---- proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD.proto | 2 +- scripts/makepkg.sh.in | 27 +++++++++++++++++++-------- 8 files changed, 46 insertions(+), 17 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: exit if updating pkgver fails
by Allan McRae 14 Oct '13

14 Oct '13

From: Zach Buhman <zack(a)buhman.org> [Allan: add details to failure message] Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cedef4c..db344a3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -813,7 +813,11 @@ update_pkgver() { if [[ -n $newpkgver && $newpkgver != "$pkgver" ]]; then if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then - @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" + if ! @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE"; then + error "$(gettext "Failure updating %s from %s to %s")" + "pkgver" "$pkgver" "$newpkgver" + exit 1 + fi @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" source_safe "$BUILDFILE" local fullver=$(get_full_version) -- 1.8.4

3 3