- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Remove notification of system upgrade when only printing URLs
by Allan McRae 01 Apr '16

01 Apr '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/sync.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 041b6b2..8ac5f57 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -694,9 +694,11 @@ static int sync_trans(alpm_list_t *targets) } if(config->op_s_upgrade) { - colon_printf(_("Starting full system upgrade...\n")); - alpm_logaction(config->handle, PACMAN_CALLER_PREFIX, - "starting full system upgrade\n"); + if(!config->print) { + colon_printf(_("Starting full system upgrade...\n")); + alpm_logaction(config->handle, PACMAN_CALLER_PREFIX, + "starting full system upgrade\n"); + } if(alpm_sync_sysupgrade(config->handle, config->op_s_upgrade >= 2) == -1) { pm_printf(ALPM_LOG_ERROR, "%s\n", alpm_strerror(alpm_errno(config->handle))); trans_release(); -- 2.7.4

2 1

[pacman-dev] [PATCH] Report local file URL for -Sp operations if package is in cache
by Allan McRae 01 Apr '16

01 Apr '16

When using "pacman -Sp" operation to get URLs of packages to download, it is useful to know which packages are already in the file cache and do not need downloaded. Print packages in the cache with a file:// prefix. e.g $ pacman -Sp glibc file:///var/cache/pacman/glibc-2.23-1-x86_64.pkg.tar.xz Fixes FS#15868 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index d924bf3..5a5c0da 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1027,11 +1027,27 @@ static char *pkg_get_location(alpm_pkg_t *pkg) char *string = NULL; switch(config->op) { case PM_OP_SYNC: - servers = alpm_db_get_servers(alpm_pkg_get_db(pkg)); - if(servers) { - pm_asprintf(&string, "%s/%s", (char *)(servers->data), - alpm_pkg_get_filename(pkg)); - return string; + if(alpm_pkg_download_size(pkg) == 0) { + /* file is already in the package cache */ + alpm_list_t *i; + const char *pkgfile = alpm_pkg_get_filename(pkg); + char path[PATH_MAX]; + struct stat buf; + + for(i = alpm_option_get_cachedirs(config->handle); i; i = i->next) { + snprintf(path, PATH_MAX, "%s%s", (char *)i->data, pkgfile); + if(stat(path, &buf) == 0 && S_ISREG(buf.st_mode)) { + pm_asprintf(&string, "file://%s", path); + return string; + } + } + } else { + servers = alpm_db_get_servers(alpm_pkg_get_db(pkg)); + if(servers) { + pm_asprintf(&string, "%s/%s", (char *)(servers->data), + alpm_pkg_get_filename(pkg)); + return string; + } } case PM_OP_UPGRADE: return strdup(alpm_pkg_get_filename(pkg)); -- 2.7.4

2 1

Re: [pacman-dev] [PATCH] libmakepkg: extension for additional BUILDENV options
by Que Quotion 01 Apr '16

01 Apr '16

Any response is welcome. I recently proved this works even with makechrootpkg: https://bbs.archlinux.org/viewtopic.php?pid=1616677

2 1

[pacman-dev] [PATCH] Handle provides with -Q
by Allan McRae 01 Apr '16

01 Apr '16

It is useful to be able to use "pacman -Qi" on any dependency, even if that dependency is a provide. For example, on Arch Linux systems, "sh" is provided by the "bash" package, and many packages depend on "sh". Querying the what package the "sh" dependency, currently first requires searching for "sh". This patch allows the use of "pacman -Qi" on a provide. Fixes FS#20650. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/query.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/pacman/query.c b/src/pacman/query.c index 0cc12e6..19e4b3f 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -80,6 +80,32 @@ static int search_path(char **filename, struct stat *bufptr) return -1; } +static alpm_pkg_t *find_provider(alpm_db_t *db_local, const char *name) +{ + alpm_list_t *packages, *i; + alpm_pkg_t *pkg = NULL; + int found = 0; + + packages = alpm_db_get_pkgcache(db_local); + + for(i = packages; i && !found; i = alpm_list_next(i)) { + alpm_list_t *provides, *p; + + pkg = i->data; + provides = alpm_pkg_get_provides(pkg); + + for(p = provides; p; p = alpm_list_next(p)) { + alpm_depend_t *d = p->data; + if(strcmp(name, d->name) == 0) { + found = 1; + break; + } + } + } + + return pkg; +} + static void print_query_fileowner(const char *filename, alpm_pkg_t *info) { if(!config->quiet) { @@ -462,6 +488,10 @@ int pacman_query(alpm_list_t *targets) alpm_pkg_load(config->handle, strname, 1, 0, &pkg); } else { pkg = alpm_db_get_pkg(db_local, strname); + /* if pkg is not found, return the first package that provides it */ + if(pkg == NULL) { + pkg = find_provider(db_local, strname); + } } if(pkg == NULL) { -- 2.7.4

2 2

[pacman-dev] [PATCH 1/1] pacman.8: add actual operation to captions for easy searching
by Christian Hesse 01 Apr '16

01 Apr '16

From: Christian Hesse <mail(a)eworm.de> I caught myself searching for operations when in need for an option. However this made me find transaction and update options only. So add the actual operations to captions for easy searching. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- doc/pacman.8.txt | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 4c0a30a..e452c0f 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -232,7 +232,7 @@ Transaction Options (apply to '-S', '-R' and '-U') Upgrade Options (apply to '-S' and '-U')[[UO]] --------------------------------------------- +---------------------------------------------- *\--force*:: Bypass file conflict checks and overwrite conflicting files. If the package that is about to be installed contains files that are already @@ -267,8 +267,8 @@ Upgrade Options (apply to '-S' and '-U')[[UO]] Do not reinstall the targets that are already up-to-date. -Query Options[[QO]] -------------------- +Query Options (apply to '-Q')[[QO]] +----------------------------------- *-c, \--changelog*:: View the ChangeLog of a package if it exists. @@ -350,8 +350,8 @@ Query Options[[QO]] database is refreshed using '-Sy'. -Remove Options[[RO]] --------------------- +Remove Options (apply to '-R')[[RO]] +------------------------------------ *-c, \--cascade*:: Remove all target packages, as well as all packages that depend on one or more target packages. This operation is recursive and must be used @@ -375,8 +375,8 @@ Remove Options[[RO]] to avoid breaking any dependencies. -Sync Options[[SO]] ------------------- +Sync Options (apply to '-S')[[SO]] +---------------------------------- *-c, \--clean*:: Remove packages that are no longer installed from the cache as well as currently unused sync databases to free up disk space. When pacman @@ -444,8 +444,8 @@ system upgrade and install/upgrade the "foo" package in the same operation. up-to-date. -Database Options[[QO]] ----------------------- +Database Options (apply to '-D')[[QO]] +-------------------------------------- *\--asdeps* <package>:: Mark a package as non-explicitly installed; in other words, set their install reason to be installed as a dependency. @@ -464,9 +464,8 @@ Database Options[[QO]] a check on the sync databases to ensure all specified dependencies are available. -File Options[[FO]] ------------------- - +File Options (apply to '-F')[[FO]] +---------------------------------- *-y, --refresh*:: Download fresh package databases from the server. Use twice to force a refresh even if databases are up to date. -- 2.7.4

2 1

[pacman-dev] makepkg: exit non-zero in case of install error
by Daniel Hahler 31 Mar '16

31 Mar '16

The following failure will make makepkg still exit with return code 0: % PKGEXT=.tar makepkg -srief ... ==> Installing package awesome-git with pacman -U... error: failed to init transaction (unable to lock database) error: could not lock database: File exists if you're sure a package manager is not already running, you can remove /var/lib/pacman/db.lck ==> WARNING: Failed to install built package(s). The code: if ! run_pacman -U "${pkglist[@]}"; then warning "$(gettext "Failed to install built package(s).")" return 0 fi It seems to be done intentionally: tree 2b824312ec75e6bf3e3247ebd28d5335f61d9190 parent 7370fd595bc0447e7c17135e3a27cc3ae64015d4 author Allan McRae <allan(a)archlinux.org> Sun Mar 29 16:49:57 2009 +1000 committer Allan McRae <allan(a)archlinux.org> Sun Mar 29 16:49:57 2009 +1000 makepkg: do not bail on failure to install built package Fixes FS#13417. Do no exit makepkg on a failure to install the built package(s). This allows clean-up to still occur. Signed-off-by: Allan McRae <allan(a)archlinux.org> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ff2663b..716c5a9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1071,10 +1071,16 @@ install_package() { pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" done + local ret=0 if [ "$ASROOT" -eq 0 ]; then - sudo pacman $PACMAN_OPTS -U ${pkglist} || exit $? + sudo pacman $PACMAN_OPTS -U ${pkglist} || ret=$? else - pacman $PACMAN_OPTS -U ${pkglist} || exit $? + pacman $PACMAN_OPTS -U ${pkglist} || ret=$? + fi + + if [ $ret -ne 0 ]; then + warning "$(gettext "Failed to install built package(s).")" + return 0 fi } Since the whole purpose of this appears to be running the clean-up in case of errors, the following would work: --- /usr/bin/makepkg 2016-03-31 15:59:32.028531972 +0200 +++ /tmp/makepkg.new 2016-03-31 15:59:27.255110641 +0200 @@ -1426,7 +1427,7 @@ if ! run_pacman -U "${pkglist[@]}"; then warning "$(gettext "Failed to install built package(s).")" - return 0 + return 1 fi } @@ -2393,7 +2394,7 @@ msg "$(gettext "Finished making: %s")" "$pkgbase $basever ($(date))" -install_package +install_package || exit $? exit 0 #E_OK (just a proof of concept, there are other calls to install_package) My use case is a script to rebuild and install a package locally, and this should abort also in case of install failures. The workaround might be to not use `-i` with `makepkg`, but run `pacman` on the generated package instead. Thanks, Daniel.

1 0

[pacman-dev] [PATCH] Print replacements when using -Sup
by Allan McRae 29 Mar '16

29 Mar '16

When printing a list of URLs of packages to be updated, pacman was ignoring any replacements that would be made in the update process. Fixes FS#35812 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/callback.c | 12 ++++++++---- test/pacman/tests/TESTS | 1 + .../tests/sync-sysupgrade-print-replaced-packages.py | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 test/pacman/tests/sync-sysupgrade-print-replaced-packages.py diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 1e1a4cd..ab3e14f 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -375,10 +375,14 @@ void cb_event(alpm_event_t *event) void cb_question(alpm_question_t *question) { if(config->print) { - if(question->type == ALPM_QUESTION_INSTALL_IGNOREPKG) { - question->any.answer = 1; - } else { - question->any.answer = 0; + switch(question->type) { + case ALPM_QUESTION_INSTALL_IGNOREPKG: + case ALPM_QUESTION_REPLACE_PKG: + question->any.answer = 1; + break; + default: + question->any.answer = 0; + break; } return; } diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 9c33020..62d1f2a 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -161,6 +161,7 @@ TESTS += test/pacman/tests/sync-nodepversion03.py TESTS += test/pacman/tests/sync-nodepversion04.py TESTS += test/pacman/tests/sync-nodepversion05.py TESTS += test/pacman/tests/sync-nodepversion06.py +TESTS += test/pacman/tests/sync-sysupgrade-print-replaced-packages.py TESTS += test/pacman/tests/sync-update-assumeinstalled.py TESTS += test/pacman/tests/sync-update-package-removing-required-provides.py TESTS += test/pacman/tests/sync001.py diff --git a/test/pacman/tests/sync-sysupgrade-print-replaced-packages.py b/test/pacman/tests/sync-sysupgrade-print-replaced-packages.py new file mode 100644 index 0000000..1325c6c --- /dev/null +++ b/test/pacman/tests/sync-sysupgrade-print-replaced-packages.py @@ -0,0 +1,14 @@ +self.description = "Print replacements when using -Sup" + + +lp = pmpkg("a", "1-1") +self.addpkg2db("local", lp) + +sp = pmpkg("b", "2-2") +sp.replaces = ["a"] +self.addpkg2db("sync", sp) + +self.args = "-Sup" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=%s-%s" % (sp.name, sp.version)) -- 2.7.4

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-16-g4960be7
by allan＠archlinux.org 29 Mar '16

29 Mar '16

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 4960be7764678783c1ac81e884ad34a535769ad1 (commit) via 59010386106eded2ee67798fa80215f250a53761 (commit) via 2ee1706a72858ea365c0e7a1a72d92ef2dae2f75 (commit) via 4cad2423a34d9bb740375f121d2390cd3cf925dc (commit) via baf1ff64e6ea23e93f307480480d87159cd2e487 (commit) via 02731189f1ced6050238e4af7e76a54d4ac6f3bd (commit) from 1a94c00e363081594bd6940d98117289b03692d6 (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 4960be7764678783c1ac81e884ad34a535769ad1 Author: Alastair Hughes <hobbitalastair(a)gmail.com> Date: Sat Mar 26 17:14:26 2016 +1300 Changed documentation to use 'the default' instead of 'a typical default' Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 59010386106eded2ee67798fa80215f250a53761 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Mar 28 16:24:22 2016 +1000 PKGBUILD.5: document that the pkgver() function runs after prepare() Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2ee1706a72858ea365c0e7a1a72d92ef2dae2f75 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 20 21:23:32 2016 +1000 Do not add root prefix twice when checking database files When checking .INSTALL and .CHANGELOG files in the mtree file, we need to find the path they are stored in the local database. This was appending the root prefix twice as alpm_option_get_dbpath already returns the absolute path to the database. While fixing that issue I added checks that the paths for the database files were not longer than PATH_MAX. Fixes FS#48563. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4cad2423a34d9bb740375f121d2390cd3cf925dc Author: Ashley Whetter <ashley(a)awhetter.co.uk> Date: Mon Mar 21 14:04:43 2016 +1000 libmakepkg: extract functions for writing .SRCINFO files Signed-off-by: Ashley Whetter <ashley(a)awhetter.co.uk> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit baf1ff64e6ea23e93f307480480d87159cd2e487 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Mar 21 11:49:16 2016 +1000 libmakepkg: ensure emptydir find command acts on individual directories Using "-exec command {} +" systax exits on any error. Such errors occur when running rmdir on a non-empty directory. Switch to "{} ;" syntax instead which avoids exiting before the find command is completed. Fixes FS#48515. Note, we can not use "-empty" in the find command because it is not supported by Busybox find, and the "--ignore-fail-on-non-empty" flag for rmdir is not available on BSD rmdir variants. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 02731189f1ced6050238e4af7e76a54d4ac6f3bd Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Feb 21 21:46:37 2016 -0500 use multi-byte character matching for user input Fixes FS#47992 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.txt | 8 +- doc/pacman.8.txt | 10 +-- doc/pacman.conf.5.txt | 12 +-- scripts/Makefile.am | 1 + scripts/libmakepkg/.gitignore | 1 + scripts/libmakepkg/srcinfo.sh.in | 127 ++++++++++++++++++++++++++++++++ scripts/libmakepkg/tidy/emptydirs.sh.in | 3 +- scripts/makepkg.sh.in | 101 ------------------------- src/pacman/check.c | 54 ++++++++------ src/pacman/util.c | 36 ++++++++- 10 files changed, 210 insertions(+), 143 deletions(-) create mode 100644 scripts/libmakepkg/srcinfo.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] www.archlinux.org/pacman/
by Jens Adam 28 Mar '16

28 Mar '16

Hi, what's the state of $subject? Footer says "Last updated 2015-03-02", so nothing about 5.0. I don't remember anything about abandoning the page (or redirecting to somewhere else, like projects.a.o) and it's still mentioned in pacman(8). --byte

3 3

[pacman-dev] [PATCH v2] Do not add root prefix twice when checking database files
by Allan McRae 28 Mar '16

28 Mar '16

When checking .INSTALL and .CHANGELOG files in the mtree file, we need to find the path they are stored in the local database. This was appending the root prefix twice as alpm_option_get_dbpath already includes the root path. While fixing that issue I added checks that the paths for the database files were not longer than PATH_MAX. Fixes FS#48563. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v2: Improve generation of paths for local db files src/pacman/check.c | 54 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/src/pacman/check.c b/src/pacman/check.c index 0fe74e8..d282cc2 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -254,7 +254,6 @@ int check_pkg_full(alpm_pkg_t *pkg) const char *root, *pkgname; size_t errors = 0; size_t rootlen; - char filepath[PATH_MAX]; struct archive *mtree; struct archive_entry *entry = NULL; size_t file_count = 0; @@ -267,7 +266,6 @@ int check_pkg_full(alpm_pkg_t *pkg) pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, ""); return 1; } - strcpy(filepath, root); pkgname = alpm_pkg_get_name(pkg); mtree = alpm_pkg_mtree_open(pkg); @@ -282,6 +280,8 @@ int check_pkg_full(alpm_pkg_t *pkg) while(alpm_pkg_mtree_next(pkg, mtree, &entry) == ARCHIVE_OK) { struct stat st; const char *path = archive_entry_pathname(entry); + char filepath[PATH_MAX]; + int filepath_len; mode_t type; size_t file_errors = 0; int backup = 0; @@ -292,31 +292,37 @@ int check_pkg_full(alpm_pkg_t *pkg) path += 2; } - if(strcmp(path, ".INSTALL") == 0) { - char filename[PATH_MAX]; - snprintf(filename, PATH_MAX, "%slocal/%s-%s/install", - alpm_option_get_dbpath(config->handle) + 1, - pkgname, alpm_pkg_get_version(pkg)); - archive_entry_set_pathname(entry, filename); - path = archive_entry_pathname(entry); - } else if(strcmp(path, ".CHANGELOG") == 0) { - char filename[PATH_MAX]; - snprintf(filename, PATH_MAX, "%slocal/%s-%s/changelog", - alpm_option_get_dbpath(config->handle) + 1, - pkgname, alpm_pkg_get_version(pkg)); - archive_entry_set_pathname(entry, filename); - path = archive_entry_pathname(entry); - } else if(*path == '.') { - continue; - } + if(*path == '.') { + const char *dbfile = NULL; - file_count++; + if(strcmp(path, ".INSTALL") == 0) { + dbfile = "install"; + } else if(strcmp(path, ".CHANGELOG") == 0) { + dbfile = "changelog"; + } else { + continue; + } - if(rootlen + 1 + strlen(path) > PATH_MAX) { - pm_printf(ALPM_LOG_WARNING, _("path too long: %s%s\n"), root, path); - continue; + /* Do not append root directory as alpm_option_get_dbpath is already + * an absoute path */ + filepath_len = snprintf(filepath, PATH_MAX, "%slocal/%s-%s/%s", + alpm_option_get_dbpath(config->handle), + pkgname, alpm_pkg_get_version(pkg), dbfile); + if(filepath_len >= PATH_MAX) { + pm_printf(ALPM_LOG_WARNING, _("path too long: %slocal/%s-%s/%s\n"), + alpm_option_get_dbpath(config->handle), + pkgname, alpm_pkg_get_version(pkg), dbfile); + continue; + } + } else { + filepath_len = snprintf(filepath, PATH_MAX, "%s%s", root, path); + if(filepath_len >= PATH_MAX) { + pm_printf(ALPM_LOG_WARNING, _("path too long: %s%s\n"), root, path); + continue; + } } - strcpy(filepath + rootlen, path); + + file_count++; exists = check_file_exists(pkgname, filepath, rootlen, &st); if(exists == 1) { -- 2.7.4

2 1