- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] add the ability to only build on new pkgver or pkgrel
by Daniel Wallace 16 Jan '13

16 Jan '13

If I haven't bumped the pkgrel, or there have been no new commits, I don't want to rebuild the package. Similar to the --needed flag, but pertains to building instead of installing. --- contrib/bash_completion.in | 4 ++-- contrib/zsh_completion.in | 1 + doc/makepkg.8.txt | 4 ++++ scripts/makepkg.sh.in | 10 +++++++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index b0901af..af382e8 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -74,8 +74,8 @@ _makepkg() { COMPREPLY=() _get_comp_words_by_ref cur prev if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then - opts=('allsource asdeps asroot check clean config force geninteg help holdver ignorearch - install log nobuild nocheck nocolor noconfirm nodeps noextract + opts=('allsource asdeps asroot buildneeded check clean config force geninteg help holdver + ignorearch install log nobuild nocheck nocolor noconfirm nodeps noextract noprogressbar nosign pkg repackage rmdeps sign skipinteg source syncdeps' 'A L R S c d e f g h i m o p r s') _arch_ptr2comp opts diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 84ee93c..342803f 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -457,6 +457,7 @@ _makepkg_longopts=( '--ignorearch[Ignore incomplete arch field in PKGBUILD]' '--clean[Clean up work files after build]' '--nodeps[Skip all dependency checks]' + '--buildneeded[Skip building if the same version is already installed]' '--noextract[Do not extract source files (use existing src/ dir)]' '--force[Overwrite existing package]' '--geninteg[Generate integrity checks for source files]' diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 498c79b..d45a703 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -58,6 +58,10 @@ Options will break the build process if all of the dependencies are not installed. +*\--buildneeded*:: + Do not build if the installed version and the version in the build script + are the same. + *-e, \--noextract*:: Do not extract source files or run the prepare() function (if present); use whatever source already exists in the $srcdir/ directory. This is diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ebc24f7..c267e56 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -65,6 +65,7 @@ SKIPCHECKSUMS=0 SKIPPGPCHECK=0 INSTALL=0 NOBUILD=0 +ONLYNEWPKGVER=0 NODEPS=0 NOEXTRACT=0 RMDEPS=0 @@ -707,6 +708,12 @@ update_pkgver() { "$BUILDFILE" fi fi + if (( ONLYNEWPKGVER )); then + if run_pacman -T "$pkgname=$pkgver-$pkgrel" 2>/dev/null; then + msg "$(gettext "Skipping -- $pkgname-$pkgver-$pkgrel is already installed")" + exit 0 + fi + fi } # Print 'source not found' error message and exit makepkg @@ -2460,7 +2467,7 @@ ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcdefFghiLmop:rRsSV" -OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'config:' 'force' 'geninteg' +OPT_LONG=('allsource' 'asroot' 'onlynewpkgver' 'check' 'clean' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'nosign' 'pkg:' 'repackage' 'rmdeps' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'skippgpcheck' 'sign' @@ -2503,6 +2510,7 @@ while true; do --nocheck) RUN_CHECK='n' ;; --nosign) SIGNPKG='n' ;; -o|--nobuild) NOBUILD=1 ;; + --buildneeded) ONLYNEWPKGVER=1 ;; -p) shift; BUILDFILE=$1 ;; --pkg) shift; IFS=, read -ra p <<<"$1"; PKGLIST+=("${p[@]}"); unset p ;; -r|--rmdeps) RMDEPS=1 ;; -- 1.8.1.1

2 1

[pacman-dev] Minor issues in lib/libalpm/dload.c
by LANGLOIS Olivier PIS -EXT 15 Jan '13

15 Jan '13

Hi, The following 2 lines has caused me some problems: curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1024L); curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 10L); When I bring my laptop at job, I find myself behind a weird corporate router/firewall that throttle down the speed to ~ 1B/sec for the first 10 seconds possibly to reduce bandwidth usage (my personal explanation. People have time to cancel unwanted downloads). This was making my pacman fail to sync any DB. It was just jumping from 1 mirror to another. To fix my problem, I just removed the 2 problematic 2 lines and now everything works like a charm. I share my problem here because I understand that these lines are used to switch to a better mirror in case poor download are caused by the server. I am wondering if I am the only and first user having this problem and how it could be solved cleanly for everyone upstream. Making the option values configurable ? deactivable? ________________________________ CONFIDENTIALITY : This e-mail and any attachments are confidential and may be privileged. If you are not a named recipient, please notify the sender immediately and do not disclose the contents to another person, use it for any purpose or store or copy the information in any medium.

2 2

[pacman-dev] [PATCH] Not trigger twice progressbar on some redirections
by Alexandre Filgueira 11 Jan '13

11 Jan '13

I found that pacman was triggerin the progressbar callback twice when pointing to my repo, which uses Mirrorbrain to geolocate the closest mirror. After asking here in this list and in the curl library list, the thing was that my header redirection response had a body, so curl was triggering twice, downloading first just bytes (of the redirection) and then the proper file. I changed the dload.c code to avoid this, I don't know if it is correct to do it the way I did. Now is triggering just once. This is my modifications: --- dload_original.c 2013-01-11 10:48:21.751443000 +0100 +++ dload_new.c 2013-01-11 10:44:13.049630000 +0100 @@ -95,6 +95,8 @@ { struct dload_payload *payload = (struct dload_payload *)file; off_t current_size, total_size; + alpm_handle_t *handle = payload->handle; + CURL *curl = get_libcurl_handle(handle); /* SIGINT sent, abort by alerting curl */ if(dload_interrupted) { @@ -103,6 +105,13 @@ current_size = payload->initial_size + (off_t)dlnow; + /* not show progressbar when redirection has body*/ + long respcode = 0; + curl_easy_getinfo (curl, CURLINFO_RESPONSE_CODE, &respcode); + if (respcode == 302 && current_size > 0) { + return 0; + } + /* is our filesize still under any set limit? */ if(payload->max_size && current_size > payload->max_size) { dload_interrupted = ABORT_OVER_MAXFILESIZE;

3 3

[pacman-dev] [PATCH] Fix release dates
by Allan McRae 10 Jan '13

10 Jan '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/index.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/index.txt b/doc/index.txt index 3d346b8..a7a82d4 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -71,8 +71,8 @@ Releases [frame="topbot",grid="none",options="header,autowidth"] !====== !Version !Date -!4.0.3 !2011-04-07 -!4.0.2 !2011-02-11 +!4.0.3 !2012-04-07 +!4.0.2 !2012-02-11 !4.0.1 !2011-11-20 !4.0.0 !2011-10-13 !4.0.0rc2 !2011-09-22 -- 1.8.1

1 0

[pacman-dev] Should pacman show just one download progress when a mirror uses redirection?
by Alexandre Filgueira 10 Jan '13

10 Jan '13

Hi I have a repo using redirections to let the server get the closest mirror for the client using Mirrorbrain software. When configuring pacman to that mirror, he follows the redirection as expected by using FOLLOWLOCATION in curl opts, but he shows 2 download progress, I guess that one is for the redirection and the last one for the file itself. So my question is... should be look like that? or would be correct to detect redirections and show just one download progress? This is an example of what is writting pacman: Proceed with installation? [Y/n] y > :: Retrieving packages from cinnarch-repo... > faenza-icon-theme-1... 382.0 B 6.51M/s 00:00 > [######################] 100% > faenza-icon-theme-1... 10.8 MiB 333K/s 00:16 > [##############--------] 66%

2 2

[pacman-dev] [PATCH] libalpm: never attempt to remove a mountpoint
by Dave Reisner 07 Jan '13

07 Jan '13

Arch Linux typically runs into this with /sys when upgrading the filesystem package in build chroots, but LXC users might also run into this, since their /sys is shared from the host and must, for security reasons, be mounted RO. I've neglected to add any tests for this because they would require root in order to run. Current tests all pass with this patch and I've confirmed the desired behavior in a VM. Incidentally, the first hunk of this patch (skipping can_remove_file checks for directories) resolves the case of API mountpoints being removed since they eventually fall into unlink_file and fail with "contains files". However, this patch should still be the Right Thing To Do™, as we can't possibly remove a directory that is also a mountpoint. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This sort of addresses some of the concerns in FS#21971 and FS#30884, but note that it doesn't actually deal with strictly read only filesystems. lib/libalpm/remove.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index b965391..548102f 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -299,6 +299,22 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, return 1; } +static int dir_is_mountpoint(alpm_handle_t *handle, const char *directory, + const struct stat *stbuf) { + char parent_dir[PATH_MAX]; + struct stat parent_stbuf; + + snprintf(parent_dir, PATH_MAX, "%s..", directory); + if(stat(parent_dir, &parent_stbuf) < 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "failed to stat parent of %s: %s: %s", + directory, parent_dir, strerror(errno)); + return 0; + } + + return stbuf->st_dev != parent_stbuf.st_dev; +} + /** * @brief Unlink a package file, backing it up if necessary. * @@ -352,6 +368,9 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, fileobj->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "keeping directory %s (in new package)\n", file); + } else if(dir_is_mountpoint(handle, file, &buf)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "keeping directory %s (mountpoint)\n", file); } else { /* one last check- does any other package own this file? */ alpm_list_t *local, *local_pkgs; @@ -479,6 +498,10 @@ static int remove_package_files(alpm_handle_t *handle, filelist = alpm_pkg_get_files(oldpkg); for(i = 0; i < filelist->count; i++) { alpm_file_t *file = filelist->files + i; + /* ignore directories */ + if(file->name[strlen(file->name) - 1] == '/') { + continue; + } if(!can_remove_file(handle, file, skip_remove)) { _alpm_log(handle, ALPM_LOG_DEBUG, "not removing package '%s', can't remove all files\n", -- 1.8.1

2 1

[pacman-dev] [PATCH] pmtest: resolve path to scriptlet shell
by Allan McRae 04 Jan '13

04 Jan '13

In order to support a variety of values for the --with-scriptlet-shell configure flag, pmtest has to be aware of what kind of path was passed, be it an absolute path or a fragment for a path lookup. For absolute paths, leave the path alone. For fragments, search the PATH environment var for the resolved path to the binary. In both cases, join the resultant path to the root directory defined for the test, not a pre-determined bin directory. Fixes FS#31552. With-contribution-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is an amalgamation of the patches Dave and I sent, with additional fixes to make it actually work... Tested with: - no --with-scriptlet-shell specified - --with-scriptlet-shell=sh - =/bin/sh - =bash - =/bin/bash - =python2 - =/usr/bin/python2 Note: specifying --with-scriptlet-shell without the full path requires the execvp patches on my working branch. Makefile.am | 1 + test/pacman/pactest.py | 5 +++++ test/pacman/pmenv.py | 2 +- test/pacman/pmtest.py | 21 +++++++++++++++++++-- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index a77b326..67255d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,6 +29,7 @@ check-local: test-pacman test-pacsort test-vercmp test-parseopts test-pacman: test/pacman src/pacman LC_ALL=C $(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \ --test $(top_srcdir)/test/pacman/tests/*.py \ + --scriptlet-shell $(SCRIPTLET_SHELL) \ -p $(top_builddir)/src/pacman/pacman test-pacsort: test/util src/util diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py index 2fb64ed..fcad160 100755 --- a/test/pacman/pactest.py +++ b/test/pacman/pactest.py @@ -3,6 +3,7 @@ # pactest : run automated testing on the pacman binary # # Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> +# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -81,6 +82,9 @@ def create_parser(): parser.add_option("--manual-confirm", action = "store_true", dest = "manualconfirm", default = False, help = "do not use --noconfirm for pacman calls") + parser.add_option("--scriptlet-shell", type = "string", + dest = "scriptletshell", default = "sh", + help = "specify shell used for install scriptlets") return parser @@ -99,6 +103,7 @@ def create_parser(): env.pacman["gdb"] = opts.gdb env.pacman["valgrind"] = opts.valgrind env.pacman["manual-confirm"] = opts.manualconfirm + env.pacman["scriptlet-shell"] = opts.scriptletshell if opts.testcases is None or len(opts.testcases) == 0: print "no tests defined, nothing to do" diff --git a/test/pacman/pmenv.py b/test/pacman/pmenv.py index 0e455ce..04948c1 100644 --- a/test/pacman/pmenv.py +++ b/test/pacman/pmenv.py @@ -66,7 +66,7 @@ def run(self): print t.description print "----------"*8 - t.generate() + t.generate(self.pacman) t.run(self.pacman) diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 00a0b96..5503559 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -1,6 +1,7 @@ #! /usr/bin/python2 # # Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> +# Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -102,7 +103,18 @@ def load(self): else: raise IOError("file %s does not exist!" % self.name) - def generate(self): + def resolve_binary(self, binary): + if os.path.isabs(binary): + return binary + + for path in os.environ["PATH"].split(':'): + resolved = os.path.join(path, binary) + if os.path.exists(resolved): + return resolved + + return binary + + def generate(self, pacman): print "==> Generating test environment" # Cleanup leftover files from a previous test session @@ -120,13 +132,18 @@ def generate(self): etcdir = os.path.join(self.root, os.path.dirname(util.PACCONF)) bindir = os.path.join(self.root, "bin") sbindir = os.path.join(self.root, "sbin") - sys_dirs = [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir, sbindir] + scriptlet_shell = self.resolve_binary(pacman["scriptlet-shell"]) + shelldir = os.path.join(self.root, os.path.dirname(scriptlet_shell)[1:]) + sys_dirs = [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir, + sbindir, shelldir] 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) + if scriptlet_shell != "/bin/sh": + shutil.copy("/bin/sh", os.path.join(self.root, scriptlet_shell[1:])) 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") -- 1.8.1

1 0

[pacman-dev] [PATCH] Consolidate --foreign/--native filtering
by Simon Gomizelj 04 Jan '13

04 Jan '13

Also fix a small bug where pacman won't check if the sync dbs are first downloaded when invoked with --native (it should). Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- lib/libalpm/alpm.h | 7 +++++++ src/pacman/conf.h | 3 +-- src/pacman/pacman.c | 4 ++-- src/pacman/query.c | 21 ++++++--------------- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 1d6a8c6..5cddd34 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -64,6 +64,13 @@ typedef enum _alpm_pkgfrom_t { ALPM_PKG_FROM_SYNCDB } alpm_pkgfrom_t; +/** Locality of a package. */ +typedef enum _alpm_locality_t { + ALPM_LOCALITY_NONE = 0, + ALPM_LOCALITY_LOCAL = (1 << 0), + ALPM_LOCALITY_FOREIGN = (1 << 1) +} alpm_locality_t; + /** Location a package object was loaded from. */ typedef enum _alpm_pkgvalidation_t { ALPM_PKG_VALIDATION_UNKNOWN = 0, diff --git a/src/pacman/conf.h b/src/pacman/conf.h index aee6859..b2d67f0 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -50,8 +50,6 @@ typedef struct __config_t { unsigned short op_q_isfile; unsigned short op_q_info; unsigned short op_q_list; - unsigned short op_q_foreign; - unsigned short op_q_native; unsigned short op_q_unrequired; unsigned short op_q_deps; unsigned short op_q_explicit; @@ -60,6 +58,7 @@ typedef struct __config_t { unsigned short op_q_changelog; unsigned short op_q_upgrade; unsigned short op_q_check; + alpm_locality_t op_q_filter; unsigned short op_s_clean; unsigned short op_s_downloadonly; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 1ca746d..83b2350 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -462,8 +462,8 @@ static int parsearg_query(int opt) case 'i': (config->op_q_info)++; break; case 'k': config->op_q_check = 1; break; case 'l': config->op_q_list = 1; break; - case 'm': config->op_q_foreign = 1; break; - case 'n': config->op_q_native = 1; break; + case 'm': config->op_q_filter |= ALPM_LOCALITY_LOCAL; break; + case 'n': config->op_q_filter |= ALPM_LOCALITY_FOREIGN; break; case 'o': config->op_q_owns = 1; break; case 'p': config->op_q_isfile = 1; break; case 'q': config->quiet = 1; break; diff --git a/src/pacman/query.c b/src/pacman/query.c index 2736672..b92f430 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -337,25 +337,20 @@ static int query_group(alpm_list_t *targets) return ret; } -static int is_foreign(alpm_pkg_t *pkg) +static alpm_locality_t pkg_get_locality(alpm_pkg_t *pkg) { const char *pkgname = alpm_pkg_get_name(pkg); alpm_list_t *j; alpm_list_t *sync_dbs = alpm_get_syncdbs(config->handle); - int match = 0; for(j = sync_dbs; j; j = alpm_list_next(j)) { alpm_db_t *db = j->data; alpm_pkg_t *findpkg = alpm_db_get_pkg(db, pkgname); if(findpkg) { - match = 1; - break; + return ALPM_LOCALITY_LOCAL; } } - if(match == 0) { - return 1; - } - return 0; + return ALPM_LOCALITY_FOREIGN; } static int is_unrequired(alpm_pkg_t *pkg) @@ -380,12 +375,8 @@ static int filter(alpm_pkg_t *pkg) alpm_pkg_get_reason(pkg) != ALPM_PKG_REASON_DEPEND) { return 0; } - /* check if this pkg is in a sync DB */ - if(config->op_q_native && is_foreign(pkg)) { - return 0; - } - /* check if this pkg isn't in a sync DB */ - if(config->op_q_foreign && !is_foreign(pkg)) { + /* check if this pkg is or isn't in a sync DB */ + if(config->op_q_filter && config->op_q_filter & pkg_get_locality(pkg)) { return 0; } /* check if this pkg is unrequired */ @@ -507,7 +498,7 @@ int pacman_query(alpm_list_t *targets) return ret; } - if(config->op_q_foreign || config->op_q_upgrade) { + if(config->op_q_filter || config->op_q_upgrade) { if(check_syncdbs(1, 1)) { return 1; } -- 1.8.0.1

3 6

[pacman-dev] [PATCH 1/2] Add msg_printf to factor out the :: from messages
by Simon Gomizelj 04 Jan '13

04 Jan '13

This will make it considerably easier to add colors properly to pacman down the road. --- src/pacman/callback.c | 24 ++++++++++++------------ src/pacman/remove.c | 2 +- src/pacman/sync.c | 14 +++++++------- src/pacman/util.c | 14 ++++++++++++++ src/pacman/util.h | 2 ++ 5 files changed, 36 insertions(+), 20 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 01c6b61..c0bb074 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -232,7 +232,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) fputs((const char *)data1, stdout); break; case ALPM_EVENT_RETRIEVE_START: - printf(_(":: Retrieving packages ...\n")); + msg_printf(_("Retrieving packages ...\n")); break; case ALPM_EVENT_DISKSPACE_START: if(config->noprogressbar) { @@ -266,14 +266,14 @@ void cb_question(alpm_question_t event, void *data1, void *data2, switch(event) { case ALPM_QUESTION_INSTALL_IGNOREPKG: if(!config->op_s_downloadonly) { - *response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), + *response = yesno(_("%s is in IgnorePkg/IgnoreGroup. Install anyway?"), alpm_pkg_get_name(data1)); } else { *response = 1; } break; case ALPM_QUESTION_REPLACE_PKG: - *response = yesno(_(":: Replace %s with %s/%s?"), + *response = yesno(_("Replace %s with %s/%s?"), alpm_pkg_get_name(data1), (char *)data3, alpm_pkg_get_name(data2)); @@ -282,12 +282,12 @@ void cb_question(alpm_question_t event, void *data1, void *data2, /* data parameters: target package, local package, conflict (strings) */ /* print conflict only if it contains new information */ if(strcmp(data1, data3) == 0 || strcmp(data2, data3) == 0) { - *response = noyes(_(":: %s and %s are in conflict. Remove %s?"), + *response = noyes(_("%s and %s are in conflict. Remove %s?"), (char *)data1, (char *)data2, (char *)data2); } else { - *response = noyes(_(":: %s and %s are in conflict (%s). Remove %s?"), + *response = noyes(_("%s and %s are in conflict (%s). Remove %s?"), (char *)data1, (char *)data2, (char *)data3, @@ -304,9 +304,9 @@ void cb_question(alpm_question_t event, void *data1, void *data2, (char *)alpm_pkg_get_name(i->data)); count++; } - printf(_n( - ":: The following package cannot be upgraded due to unresolvable dependencies:\n", - ":: The following packages cannot be upgraded due to unresolvable dependencies:\n", + msg_printf(_n( + "The following package cannot be upgraded due to unresolvable dependencies:\n", + "The following packages cannot be upgraded due to unresolvable dependencies:\n", count)); list_display(" ", namelist, getcols(fileno(stdout))); printf("\n"); @@ -322,7 +322,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2, alpm_list_t *providers = data1; size_t count = alpm_list_count(providers); char *depstring = alpm_dep_compute_string((alpm_depend_t *)data2); - printf(_(":: There are %zd providers available for %s:\n"), count, + msg_printf(_("There are %zd providers available for %s:\n"), count, depstring); free(depstring); select_display(providers); @@ -331,7 +331,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2, break; case ALPM_QUESTION_LOCAL_NEWER: if(!config->op_s_downloadonly) { - *response = yesno(_(":: %s-%s: local version is newer. Upgrade anyway?"), + *response = yesno(_("%s-%s: local version is newer. Upgrade anyway?"), alpm_pkg_get_name(data1), alpm_pkg_get_version(data1)); } else { @@ -339,7 +339,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2, } break; case ALPM_QUESTION_CORRUPTED_PKG: - *response = yesno(_(":: File %s is corrupted (%s).\n" + *response = yesno(_("File %s is corrupted (%s).\n" "Do you want to delete it?"), (char *)data1, alpm_strerror(*(alpm_errno_t *)data2)); @@ -356,7 +356,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2, revoked = " (revoked)"; } - *response = yesno(_(":: Import PGP key %d%c/%s, \"%s\", created: %s%s?"), + *response = yesno(_("Import PGP key %d%c/%s, \"%s\", created: %s%s?"), key->length, key->pubkey_algo, key->fingerprint, key->uid, created, revoked); } break; diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 472adb5..ebe4692 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -119,7 +119,7 @@ int pacman_remove(alpm_list_t *targets) for(i = data; i; i = alpm_list_next(i)) { alpm_depmissing_t *miss = i->data; char *depstring = alpm_dep_compute_string(miss->depend); - printf(_(":: %s: requires %s\n"), miss->target, depstring); + msg_printf(_("%s: requires %s\n"), miss->target, depstring); free(depstring); } break; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 532a667..34e7330 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -661,7 +661,7 @@ static int process_group(alpm_list_t *dbs, const char *group, int error) } if(config->print == 0) { - printf(_(":: There are %d members in group %s:\n"), count, + msg_printf(_("There are %d members in group %s:\n"), count, group); select_display(pkgs); char *array = malloc(count); @@ -786,7 +786,7 @@ static int sync_trans(alpm_list_t *targets) } if(config->op_s_upgrade) { - printf(_(":: Starting full system upgrade...\n")); + msg_printf(_("Starting full system upgrade...\n")); alpm_logaction(config->handle, "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))); @@ -812,14 +812,14 @@ int sync_prepare_execute(void) case ALPM_ERR_PKG_INVALID_ARCH: for(i = data; i; i = alpm_list_next(i)) { const char *pkg = i->data; - printf(_(":: package %s does not have a valid architecture\n"), pkg); + msg_printf(_("package %s does not have a valid architecture\n"), pkg); } break; case ALPM_ERR_UNSATISFIED_DEPS: for(i = data; i; i = alpm_list_next(i)) { alpm_depmissing_t *miss = i->data; char *depstring = alpm_dep_compute_string(miss->depend); - printf(_(":: %s: requires %s\n"), miss->target, depstring); + msg_printf(_("%s: requires %s\n"), miss->target, depstring); free(depstring); } break; @@ -828,11 +828,11 @@ int sync_prepare_execute(void) alpm_conflict_t *conflict = i->data; /* only print reason if it contains new information */ if(conflict->reason->mod == ALPM_DEP_MOD_ANY) { - printf(_(":: %s and %s are in conflict\n"), + msg_printf(_("%s and %s are in conflict\n"), conflict->package1, conflict->package2); } else { char *reason = alpm_dep_compute_string(conflict->reason); - printf(_(":: %s and %s are in conflict (%s)\n"), + msg_printf(_("%s and %s are in conflict (%s)\n"), conflict->package1, conflict->package2, reason); free(reason); } @@ -953,7 +953,7 @@ int pacman_sync(alpm_list_t *targets) if(config->op_s_sync) { /* grab a fresh package list */ - printf(_(":: Synchronizing package databases...\n")); + msg_printf(_("Synchronizing package databases...\n")); alpm_logaction(config->handle, "synchronizing package lists\n"); if(!sync_synctree(config->op_s_sync, sync_dbs)) { return 1; diff --git a/src/pacman/util.c b/src/pacman/util.c index 5ed450e..e980e5d 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1491,6 +1491,7 @@ static int question(short preset, char *fmt, va_list args) fflush(stdout); fflush(stderr); + fprintf(stream, ":: "); vfprintf(stream, fmt, args); if(preset) { @@ -1552,6 +1553,19 @@ int noyes(char *fmt, ...) return ret; } +int msg_printf(const char *fmt, ...) +{ + int ret; + va_list args; + + printf(":: "); + va_start(args, fmt); + ret = vprintf(fmt, args); + va_end(args); + + return ret; +} + int pm_printf(alpm_loglevel_t level, const char *format, ...) { int ret; diff --git a/src/pacman/util.h b/src/pacman/util.h index 0dfdc85..644dcc4 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -75,6 +75,8 @@ int multiselect_question(char *array, int count); int yesno(char *fmt, ...); int noyes(char *fmt, ...); +int msg_printf(const char *fmt, ...); + int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_asprintf(char **string, const char *format, ...); int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); -- 1.8.0.1

2 1

[pacman-dev] [PATCH] Make pacman say its downgrading packages
by Simon Gomizelj 04 Jan '13

04 Jan '13

When the package being installed has a lower version than the local one, print that its 'downgrading' instead of 'upgrading' on screen and in the log. Fixes FS#30392 Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- lib/libalpm/add.c | 59 ++++++++++++++++++++++----------------------------- lib/libalpm/alpm.h | 10 +++++++++ src/pacman/callback.c | 15 +++++++++++++ 3 files changed, 50 insertions(+), 34 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index edddc31..357fc0e 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -453,10 +453,13 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, size_t pkg_current, size_t pkg_count) { int i, ret = 0, errors = 0; - int is_upgrade; + int is_upgrade = 0; alpm_pkg_t *oldpkg = NULL; alpm_db_t *db = handle->db_local; alpm_trans_t *trans = handle->trans; + alpm_progress_t event = ALPM_PROGRESS_ADD_START; + alpm_event_t end = ALPM_EVENT_ADD_DONE, start = ALPM_EVENT_ADD_START; + const char *msg = "adding"; const char *pkgfile; ASSERT(trans != NULL, return -1); @@ -464,6 +467,18 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* see if this is an upgrade. if so, remove the old package first */ alpm_pkg_t *local = _alpm_db_get_pkgfromcache(db, newpkg->name); if(local) { + int cmp = _alpm_pkg_compare_versions(newpkg, local); + if(cmp < 0) { + msg = "downgrading"; + event = ALPM_PROGRESS_DOWNGRADE_START; + start = ALPM_EVENT_DOWNGRADE_START; + end = ALPM_EVENT_DOWNGRADE_DONE; + } else { + msg = "upgrading"; + event = ALPM_PROGRESS_UPGRADE_START; + start = ALPM_EVENT_UPGRADE_START; + end = ALPM_EVENT_UPGRADE_DONE; + } is_upgrade = 1; /* we'll need to save some record for backup checks later */ @@ -474,17 +489,15 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* copy over the install reason */ newpkg->reason = alpm_pkg_get_reason(local); - - EVENT(handle, ALPM_EVENT_UPGRADE_START, newpkg, local); - } else { - is_upgrade = 0; - EVENT(handle, ALPM_EVENT_ADD_START, newpkg, NULL); } + EVENT(handle, start, newpkg, NULL); + pkgfile = newpkg->origin_data.file; - _alpm_log(handle, ALPM_LOG_DEBUG, "%s package %s-%s\n", - is_upgrade ? "upgrading" : "adding", newpkg->name, newpkg->version); + _alpm_log(handle, ALPM_LOG_DEBUG, "%s package %s-%s\n", msg, + newpkg->name, newpkg->version); + /* pre_install/pre_upgrade scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { @@ -552,13 +565,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, } /* call PROGRESS once with 0 percent, as we sort-of skip that here */ - if(is_upgrade) { - PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START, - newpkg->name, 0, pkg_count, pkg_current); - } else { - PROGRESS(handle, ALPM_PROGRESS_ADD_START, - newpkg->name, 0, pkg_count, pkg_current); - } + PROGRESS(handle, event, newpkg->name, 0, pkg_count, pkg_current); for(i = 0; archive_read_next_header(archive, &entry) == ARCHIVE_OK; i++) { int percent; @@ -576,13 +583,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, percent = 0; } - if(is_upgrade) { - PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START, - newpkg->name, percent, pkg_count, pkg_current); - } else { - PROGRESS(handle, ALPM_PROGRESS_ADD_START, - newpkg->name, percent, pkg_count, pkg_current); - } + PROGRESS(handle, event, newpkg->name, percent, pkg_count, pkg_current); /* extract the next file from the archive */ errors += extract_single_file(handle, archive, entry, newpkg, oldpkg); @@ -636,13 +637,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, newpkg->name); } - if(is_upgrade) { - PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START, - newpkg->name, 100, pkg_count, pkg_current); - } else { - PROGRESS(handle, ALPM_PROGRESS_ADD_START, - newpkg->name, 100, pkg_count, pkg_current); - } + PROGRESS(handle, event, newpkg->name, 100, pkg_count, pkg_current); /* run the post-install script if it exists */ if(alpm_pkg_has_scriptlet(newpkg) @@ -655,11 +650,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, free(scriptlet); } - if(is_upgrade) { - EVENT(handle, ALPM_EVENT_UPGRADE_DONE, newpkg, oldpkg); - } else { - EVENT(handle, ALPM_EVENT_ADD_DONE, newpkg, oldpkg); - } + EVENT(handle, end, newpkg, oldpkg); cleanup: _alpm_pkg_free(oldpkg); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 1d6a8c6..bc067e0 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -311,6 +311,15 @@ typedef enum _alpm_event_t { * to the callback, respectively. */ ALPM_EVENT_UPGRADE_DONE, + /** Package will be downgraded. + * A pointer to the downgraded package is passed to the callback. + */ + ALPM_EVENT_DOWNGRADE_START, + /** Package was downgraded. + * A pointer to the new package, and a pointer to the old package is passed + * to the callback, respectively. + */ + ALPM_EVENT_DOWNGRADE_DONE, /** Target package's integrity will be checked. */ ALPM_EVENT_INTEGRITY_START, /** Target package's integrity was checked. */ @@ -378,6 +387,7 @@ typedef enum _alpm_progress_t { ALPM_PROGRESS_ADD_START, ALPM_PROGRESS_UPGRADE_START, ALPM_PROGRESS_REMOVE_START, + ALPM_PROGRESS_DOWNGRADE_START, ALPM_PROGRESS_CONFLICTS_START, ALPM_PROGRESS_DISKSPACE_START, ALPM_PROGRESS_INTEGRITY_START, diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 01c6b61..5ebe957 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -203,6 +203,18 @@ void cb_event(alpm_event_t event, void *data1, void *data2) alpm_pkg_get_version(data1)); display_new_optdepends(data2,data1); break; + case ALPM_EVENT_DOWNGRADE_START: + if(config->noprogressbar) { + printf(_("downgrading %s...\n"), alpm_pkg_get_name(data1)); + } + break; + case ALPM_EVENT_DOWNGRADE_DONE: + alpm_logaction(config->handle, "downgraded %s (%s -> %s)\n", + alpm_pkg_get_name(data1), + alpm_pkg_get_version(data2), + alpm_pkg_get_version(data1)); + display_new_optdepends(data2,data1); + break; case ALPM_EVENT_INTEGRITY_START: if(config->noprogressbar) { printf(_("checking package integrity...\n")); @@ -423,6 +435,9 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, case ALPM_PROGRESS_REMOVE_START: opr = _("removing"); break; + case ALPM_PROGRESS_DOWNGRADE_START: + opr = _("downgrading"); + break; case ALPM_PROGRESS_CONFLICTS_START: opr = _("checking for file conflicts"); break; -- 1.8.0.1

2 1