April 2016 - Pacman-dev - lists.archlinux.org

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

01 Apr '16

On Sat, Apr 2, 2016 at 1:31 AM, Que Quotion <quequotion(a)gmail.com> wrote: > >>apg > > I was not aware that there is any such patch submission procedure. I will resubmit the patch shortly. > > > Actually, this has proven to be exceedingly difficult. The pacman-dev archive does not offer header information, so it will not be possible for me to reply to any specific Message-ID (the best I can do, even with git send-email, is "Re: this discussion subject line"). In fact, I did submit a properly formatted patch over a week ago but it has been ignored long enough to be in last month's discussion archive. Please look at my properly formatted patch under the same heading in last month's (last week's) discussion. Resubmitting this patch would be redundant.

2 1

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

01 Apr '16

>>apg I was not aware that there is any such patch submission procedure. I will resubmit the patch shortly.

1 0

[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