- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Show used/freed space when syncing (FR FS#12566)
by Hugo Chargois 11 Jan '10

11 Jan '10

Shows the "Total Used/Freed Size" after "Total Download Size" and "Total Installed Size" when syncing packages. It is the difference of installation size between packages to be updated and the installation size of the older version of these packages on disk. For exemple, if uploading to a new version of a package that has an installed size of 60 and the old version has an installed size of 50, this will show 10. Negative numbers represent space actually freed. Signed-off-by: Hugo Chargois <hugo.chargois(a)free.fr> --- src/pacman/util.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 14a0f6c..e1e0064 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -44,6 +44,7 @@ #include "conf.h" #include "callback.h" +extern pmdb_t db_local; int trans_init(pmtransflag_t flags) { @@ -498,8 +499,8 @@ void display_targets(const alpm_list_t *pkgs, int install) { char *str; const alpm_list_t *i; - off_t isize = 0, dlsize = 0; - double mbisize = 0.0, mbdlsize = 0.0; + off_t isize = 0, dlsize = 0, localsize = 0; + double mbisize = 0.0, mbdlsize = 0.0, mbdeltasize = 0.0; alpm_list_t *targets = NULL; if(!pkgs) { @@ -510,8 +511,14 @@ void display_targets(const alpm_list_t *pkgs, int install) for(i = pkgs; i; i = alpm_list_next(i)) { pmpkg_t *pkg = alpm_list_getdata(i); + char *name = alpm_pkg_get_name(pkg); + pmpkg_t *local_pkg = alpm_db_get_pkg(db_local, name); + dlsize += alpm_pkg_download_size(pkg); isize += alpm_pkg_get_isize(pkg); + if(local_pkg != NULL){ + localsize += alpm_pkg_get_isize(local_pkg); + } /* print the package size with the output if ShowSize option set */ if(config->showsize) { @@ -527,9 +534,10 @@ void display_targets(const alpm_list_t *pkgs, int install) targets = alpm_list_add(targets, str); } - /* Convert byte sizes to MB */ + /* Convert byte sizes to MB and calculate delta size*/ mbdlsize = dlsize / (1024.0 * 1024.0); mbisize = isize / (1024.0 * 1024.0); + mbdeltasize = (isize - localsize) / (1024.0 * 1024.0); if(install) { asprintf(&str, _("Targets (%d):"), alpm_list_count(targets)); @@ -539,6 +547,7 @@ void display_targets(const alpm_list_t *pkgs, int install) printf(_("Total Download Size: %.2f MB\n"), mbdlsize); printf(_("Total Installed Size: %.2f MB\n"), mbisize); + printf(_("Total Size Used/Freed: % .2f MB\n"), mbdeltasize); } else { asprintf(&str, _("Remove (%d):"), alpm_list_count(targets)); list_display(str, targets); -- 1.6.3.3

1 0

[pacman-dev] Humble proposal: replace autotools by CMake for pacman
by Yannick LM 09 Jan '10

09 Jan '10

Hi, First of all, since it's my first message on this list, a few words about myself: I'm a French software engineer in a small company, I've use Arch from several years now, and CMake at work. (We produce a big piece of software written in C++ that must run on windows, linux and mac) I'm also a huge fan of the Python language. Also, a few words about cmake: Web page: http://www.cmake.org/ Typical workflow is: cd /path/to/source mkdir build cd build cmake .. ccmake . #optional, to change configuration make Pros : * Nothing gets generated anywhere but in source/build, so there's no need for "clean" rules and a .gitignore containing "build" is enough :) * It's widely used, so lots of stuff such as using gettext is easily done. * It's fast! (written in C++) Cons: * It has a ugly syntax * It lacks decent documentation: http://cmake.org/cmake/help/cmake-2-8-docs.html is all you've got. Back to the subject: one day I decided it would be great to see libalpm wrapped in Python (or Ruby, or whatever ...) It's quite easy done once you use swig, and swig is easy when you use cmake. So, I started hacking a few CMakeLists files. The result is in a "cmake" branch in git://sd-5791.dedibox.fr/prog/pacman.git (which I'll try to keep not too far from pacman's official master branch) Right now, here's what those files can do: * let the user choose a few variables such as CONFFILE, DBEXT, LOGFILE (using ccmake) * build libalpm and pacman * install some files. If you want, I could take care of everything that's still missing: documentation, translations, tests ... I don't have much spare time to spend on this, but there's no need to hurry, isn't it? Just let me know if you are interested or if you have any question on the subject. Cheers, Yannick LM

3 3

[pacman-dev] Parsing variables in PKGBUILD packaging functions.
by Xyne 06 Jan '10

06 Jan '10

Hi, Is there any way to _unequivocally_ parse PKGBUILD variables within a "package" function, e.g. "depends", without executing the entire code block? Please tell me that you don't actually need to build the package(s) to get all of the variables. Thanks, Xyne *holds breath and hopes*

2 2

[pacman-dev] Handling splitpkg overrides in scripts
by Allan McRae 27 Dec '09

27 Dec '09

This is the start of what will be a makepkg test suite. It shows a (somewhat robust?) method of parsing splitpkg overrides so will be of use when updating db-scripts to handle splitpkg's with different arch/pkgrel/pkgver's (which can be overrided in pacman-git now). It extracts the "package_foo()" function with a sed statements that assumes that it starts at the start of the line and the closing "}" is the only thing on its line (could be made more robust...). Then is extracts the various variables using a grep. It can handle the following syntax: foo=1 foo=STRING foo="ABC DEF" for=('a' 'b' \ 'c' ) which is basically everything... Any comments on how to improve this are welcome. Allan #!/bin/bash splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ 'backup' 'options' 'install' 'changelog') readonly -a splitpkg_overrides backup_package_variables() { for var in ${splitpkg_overrides[@]}; do indirect="${var}_backup" eval "${indirect}=(\"\${$var[@]}\")" done } restore_package_variables() { for var in ${splitpkg_overrides[@]}; do indirect="${var}_backup" if [[ -n ${!indirect} ]]; then eval "${var}=(\"\${$indirect[@]}\")" else unset ${var} fi done } parse_splitpkg_overrides() { if grep -q "package_$1()" PKGBUILD; then pkgfunc=$(sed -n "/^package_$1/,/^}/p" PKGBUILD) for var in ${splitpkg_overrides[@]}; do eval $(echo $pkgfunc | grep -Eo "$var=(\"[^)]*\"|$[^)]*$|[^ ]*)") done fi } ## # Checks if all packages are created - does not work yet... :P ## pkg_exists() { # get package arch if [[ $arch != "any" ]]; then arch=$CARCH fi for pkg in ${pkgname[@]}; do # check for package specific overrides backup_package_variables parse_splitpkg_overrides $pkg echo $pkg-$pkgver-$pkgrel-$arch$PKGEXT restore_package_variables done } source /etc/makepkg.conf source PKGBUILD pkg_exists

1 0

[pacman-dev] [PATCH] Do not print installed size when only downloading
by Allan McRae 23 Dec '09

23 Dec '09

When using --downloadonly the "Total Installed Size" message is not needed and perhaps misleading. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 14a0f6c..d237d00 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -538,7 +538,9 @@ void display_targets(const alpm_list_t *pkgs, int install) printf("\n"); printf(_("Total Download Size: %.2f MB\n"), mbdlsize); - printf(_("Total Installed Size: %.2f MB\n"), mbisize); + if(!(config->flags & PM_TRANS_FLAG_DOWNLOADONLY)) { + printf(_("Total Installed Size: %.2f MB\n"), mbisize); + } } else { asprintf(&str, _("Remove (%d):"), alpm_list_count(targets)); list_display(str, targets); -- 1.6.5.6

1 0

[pacman-dev] [PATCH] Allow -Qo to perform a functional 'which'
by Allan McRae 23 Dec '09

23 Dec '09

When pacman queries the ownership of an object that is not a path, it will check in the users PATH for a match. Implements FS#8798. Patch-by: Shankar <jatheendra(a)gmail.com> [Allan: rework for master, tidy-up] Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This was original posted a year ago... http://mailman.archlinux.org/pipermail/pacman-dev/2008-November/007659.html The comments then were that we should maybe refactor out stuff dealing with file paths, specifically removing trailing backslashes. That appears to only occur in two other places and is very simple so I do not thing it needs refactored and can be done in a spearate patch if necessary. The only other part I do not like is the "failed to read file" error block is repeated, but I can not see a nice way to fix that. src/pacman/query.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 53 insertions(+), 5 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 6b6a25d..6f579fd 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -56,6 +56,41 @@ static char *resolve_path(const char* file) return(str); } +/* check if filename exists in PATH */ +static int search_path(char *filename, struct stat * bufptr) +{ + char *envpath, *path, *fullname; + int len; + + if ((envpath = getenv("PATH")) == NULL) { + return(-1); + } + if ((envpath = strdup(envpath)) == NULL) { + return(-1); + } + + fullname = calloc(PATH_MAX+1, sizeof(char)); + + while ((path = strsep(&envpath, ":")) != NULL) { + len = strlen(path); + + /* strip the trailing slash if one exists */ + if(path[len - 1] == '/') { + path[len - 1] = '\0'; + } + + snprintf(fullname, PATH_MAX+1, "%s/%s", path, filename); + + if(stat(fullname, bufptr) == 0) { + strncpy(filename, fullname, PATH_MAX+1); + free(fullname); + return(0); + } + } + free(fullname); + return(-1); +} + static int query_fileowner(alpm_list_t *targets) { int ret = 0; @@ -67,19 +102,31 @@ static int query_fileowner(alpm_list_t *targets) return(1); } + char *filename = calloc(PATH_MAX+1, sizeof(char)); + for(t = targets; t; t = alpm_list_next(t)) { int found = 0; - char *filename = alpm_list_getdata(t); + strncpy(filename, alpm_list_getdata(t), PATH_MAX+1); char *bname, *dname, *rpath; const char *root; struct stat buf; alpm_list_t *i, *j; if(lstat(filename, &buf) == -1) { - pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), - filename, strerror(errno)); - ret++; - continue; + /* if it is not a path but a program name, then check in PATH */ + if(strchr(filename, '/') == NULL) { + if(search_path(filename, &buf) == -1) { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } + } else { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } } if(S_ISDIR(buf.st_mode)) { @@ -140,6 +187,7 @@ static int query_fileowner(alpm_list_t *targets) free(rpath); } + free(filename); return ret; } -- 1.6.5.6

3 8

[pacman-dev] [PATCH] makepkg: make strip options configurable
by Cedric Staniewski 21 Dec '09

21 Dec '09

The newly added variables STRIP_BINARIES, STRIP_SHARED and STRIP_STATIC, that are set in makepkg.conf, specify the strip options used on binaries and shared and static libraries. In addition, files are now stripped more aggressively by default. Implements FS#13592 the way it was suggested by Allan in the comments. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- configure.ac | 9 +++++++++ doc/Makefile.am | 14 ++++++++++++-- doc/makepkg.conf.5.txt | 12 ++++++++++++ etc/Makefile.am | 3 +++ etc/makepkg.conf.in | 6 ++++++ scripts/makepkg.sh.in | 6 +++--- 6 files changed, 45 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 80e41a6..faf774f 100644 --- a/configure.ac +++ b/configure.ac @@ -186,6 +186,9 @@ GCC_GNU89_INLINE_CC # Host-dependant definitions SIZECMD="stat -L -c %s" SEDINPLACE="sed -i" +STRIP_BINARIES="--strip-all" +STRIP_SHARED="--strip-unneeded" +STRIP_STATIC="--strip-debug" case "${host_os}" in *bsd*) SIZECMD="stat -L -f %z" @@ -199,6 +202,9 @@ case "${host_os}" in host_os_darwin=yes SIZECMD="/usr/bin/stat -L -f %z" SEDINPLACE="/usr/bin/sed -i ''" + STRIP_BINARIES="" + STRIP_SHARED="-S" + STRIP_STATIC="-S" ;; esac @@ -206,6 +212,9 @@ AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) +AC_SUBST(STRIP_BINARIES) +AC_SUBST(STRIP_SHARED) +AC_SUBST(STRIP_STATIC) # Check for architecture, used in default makepkg.conf # (Note single space left after CARCHFLAGS) diff --git a/doc/Makefile.am b/doc/Makefile.am index fcbcab8..ce1adab 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -66,6 +66,12 @@ else REAL_PACKAGE_VERSION = $(PACKAGE_VERSION) endif +#### Taken from the autoconf scripts Makefile.am #### +edit = sed \ + -e 's|@STRIP_BINARIES[@]|$(STRIP_BINARIES)|g' \ + -e 's|@STRIP_SHARED[@]|$(STRIP_SHARED)|g' \ + -e 's|@STRIP_STATIC[@]|$(STRIP_STATIC)|g' + man_MANS = dist_man_MANS = $(ASCIIDOC_MANS) repo-remove.8 @@ -93,8 +99,12 @@ A2X_OPTS = \ --xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0' # These rules are due to the includes and files of the asciidoc text -$(ASCIIDOC_MANS): asciidoc.conf footer.txt - a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt +$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile + @echo GEN $@; + @rm -f $@.tmp + @test -f $(srcdir)/$@.txt && $(edit) $(srcdir)/$@.txt >$@.tmp || true + a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.tmp + @rm -f $@.tmp %.html: %.txt asciidoc $(ASCIIDOC_OPTS) -a linkcss $*.txt diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 88c4cbb..359db68 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -135,6 +135,18 @@ Options affects both generation and checking. The current valid options are: `md5`, `sha1`, `sha256`, `sha384`, and `sha512`. +**STRIP_BINARIES=**"@STRIP_BINARIES@":: + Options to be used when stripping binaries. See `strip''s man page + for details. + +**STRIP_SHARED=**"@STRIP_SHARED@":: + Options to be used when stripping shared libraries. See `strip''s + man page for details. + +**STRIP_STATIC=**"@STRIP_STATIC@":: + Options to be used when stripping static libraries. See `strip''s + man page for details. + **MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**:: If `zipman` is specified in the OPTIONS array, this variable will instruct makepkg where to look to compress manual (man and info) diff --git a/etc/Makefile.am b/etc/Makefile.am index 55c28c3..25f1834 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -13,6 +13,9 @@ edit = sed \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@PKGEXT[@]|$(PKGEXT)|g' \ -e 's|@SRCEXT[@]|$(SRCEXT)|g' \ + -e 's|@STRIP_BINARIES[@]|$(STRIP_BINARIES)|g' \ + -e 's|@STRIP_SHARED[@]|$(STRIP_SHARED)|g' \ + -e 's|@STRIP_STATIC[@]|$(STRIP_STATIC)|g' \ -e 's|@CARCH[@]|$(CARCH)|g' \ -e 's|@CHOST[@]|$(CHOST)|g' \ -e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \ diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 3a3a415..032a7fc 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -72,6 +72,12 @@ OPTIONS=(strip docs libtool emptydirs zipman purge) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) +#-- Options to be used when stripping binaries. See `man strip' for details. +STRIP_BINARIES="@STRIP_BINARIES@" +#-- Options to be used when stripping shared libraries. See `man strip' for details. +STRIP_SHARED="@STRIP_SHARED@" +#-- Options to be used when stripping static libraries. See `man strip' for details. +STRIP_STATIC="@STRIP_STATIC@" #-- Manual (man and info) directories to compress (if zipman is specified) MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) #-- Doc directories to remove (if !docs is specified) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0688e7c..e2d6cef 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -853,11 +853,11 @@ tidy_install() { *compressed-encoding*) # Skip compressed binaries ;; *application/x-sharedlib*) # Libraries (.so) - /usr/bin/strip -S "$binary";; + /usr/bin/strip $STRIP_SHARED "$binary";; *application/x-archive*) # Libraries (.a) - /usr/bin/strip -S "$binary";; + /usr/bin/strip $STRIP_STATIC "$binary";; *application/x-executable*) # Binaries - /usr/bin/strip "$binary";; + /usr/bin/strip $STRIP_BINARIES "$binary";; esac done fi -- 1.6.5.6

2 5

Re: [pacman-dev] [arch-dev-public] doc size
by Xavier 18 Dec '09

18 Dec '09

On Wed, Dec 16, 2009 at 11:07 PM, Xavier <shiningxc(a)gmail.com> wrote: > > The results are slightly different, mostly because makepkg > overestimates uncompressed size by not using -a with du, while namcap > lotsofdocs computes the real size. > > Now that I think about it, maybe the trick/hack I used in my first > script would actually be a portable way to get the real uncompressed > size : > bsdtar tvf foo.pkg.tar.gz 2>/dev/null | awk '{ SUM += $5 } END { print SUM }' > > But this is offtopic, I should find again the makepkg bug report we > had about this that we probably rejected :P > http://bugs.archlinux.org/task/11225 I see, so we made a patch for repo-add : http://bugs.archlinux.org/task/11225?getfile=2429 I also made one for makepkg : http://bugs.archlinux.org/task/11225?getfile=2426 But Dan rejected it with this reason : "Note that I did not touch makepkg because our size there is not critical- a size to the nearest K is just fine, and switching to a find/stat way of doing it would cause all hard links to get double-counted." It is a size to the nearest K for each file, and we accumulate the errors ? I did not realize the difference was so big until today, when playing with docsize stuff. e.g. for libsigc++-2.0 : du -s = 12040 K du -s --apparent-size = 10723 K So that's 1300K. and 12% error if I am not mistaken.

2 3

[pacman-dev] [PATCH 1/2] callback.c : less magic progress bars
by Xavier Chantry 16 Dec '09

16 Dec '09

1 - Explain magic numbers 2 - There was a weird off by 1 mess in the progress bar. The code supposedly shared the width between 50 chars for text (textlen) and the rest for the progress bar (proglen = getcols() - textlen). But the code actually used textlen + 1 for the text and proglen - 1 for the progress bar (with haslen=1, the progress bar was actually empty), which was a bit confusing so I changed it. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- src/pacman/callback.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 15f5423..a40a702 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -90,20 +90,20 @@ static float get_update_timediff(int first_call) static void fill_progress(const int bar_percent, const int disp_percent, const int proglen) { - const unsigned int hashlen = proglen - 8; - const unsigned int hash = bar_percent * hashlen / 100; - static unsigned int lasthash = 0, mouth = 0; - unsigned int i; + /* 8 = 1 space + 1 [ + 1 ] + 5 for percent */ + const int hashlen = proglen - 8; + const int hash = bar_percent * hashlen / 100; + static int lasthash = 0, mouth = 0; + int i; if(bar_percent == 0) { lasthash = 0; mouth = 0; } - /* magic numbers, how I loathe thee */ - if(proglen > 8) { + if(hashlen > 0) { printf(" ["); - for(i = hashlen; i > 1; --i) { + for(i = hashlen; i > 0; --i) { /* if special progress bar enabled */ if(config->chomp) { if(i > hashlen - hash) { @@ -139,7 +139,8 @@ static void fill_progress(const int bar_percent, const int disp_percent, printf("]"); } /* print display percent after progress bar */ - if(proglen > 5) { + /* 5 = 1 space + 3 digits + 1 % */ + if(proglen >= 5) { printf(" %3d%%", disp_percent); } @@ -376,7 +377,7 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, ++digits; } /* determine room left for non-digits text [not ( 1/12) part] */ - textlen = infolen - 3 - (2 * digits); + textlen = infolen - 3 /* (/) */ - (2 * digits) - 1 /* space */; /* In order to deal with characters from all locales, we have to worry * about wide characters and their column widths. A lot of stuff is @@ -451,7 +452,8 @@ void cb_dl_total(off_t total) void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) { const int infolen = 50; - const int filenamelen = infolen - 27; + /* explanation of magic 28 number at the end */ + const int filenamelen = infolen - 28; char *fname, *p; /* used for wide character width determination and printing */ int len, wclen, wcwid, padwid; @@ -613,6 +615,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) } } + /* 1 space + filenamelen + 1 space + 7 for size + 1 + 7 for rate + 2 for /s + 1 space + 8 for eta */ printf(" %ls%-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", wcfname, padwid, "", f_xfered, xfered_size, rate, rate_size, eta_h, eta_m, eta_s); -- 1.6.5.6

1 1

[pacman-dev] [PATCH] zsh_completion: Add proper completion for --ignore and --ignoregroup
by Nezmer 15 Dec '09

15 Dec '09

This patch provides proper comma-separated completions for --ignore and --ignoregroup Signed-off-by: Nezmer <Nezmer(a)allurelinux.org> --- contrib/zsh_completion | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/contrib/zsh_completion b/contrib/zsh_completion index 2f43d9b..b27261f 100644 --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -86,9 +86,9 @@ _pacman_opts_sync_modifiers=( '-w[Download packages only]' '-y[Download fresh package databases]' '*--ignore[Ignore a package upgrade]:package: - _pacman_completions_all_packages' - '*--ignoregroup[Ignore a group upgrade]:package group: - _pacman_completions_all_groups' + _pacman_completions_ignore_packages' + '*--ignoregroup[Ignore a group upgrade]:group: + _pacman_completions_ignore_groups' '--asdeps[Install packages as non-explicitly installed]' '--asexplicit[Install packages as explicitly installed]' ) @@ -240,6 +240,29 @@ _pacman_completions_all_packages() { fi } +# provides comma-separated completions for packages available from repositories +# to be used with --ignore +_pacman_completions_ignore_packages() { + local -a cmd packages repositories packages_long + + repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + typeset -U repositories + packages_long=(/var/lib/pacman/sync/${^repositories}/*(/)) + packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + typeset -U packages + _wanted packages expl "packages" _values -s "," compadd - "${(@)packages}" +} + +# provides comma-separated completions for package groups to be used +# with --ignoregroup +_pacman_completions_ignore_groups() { + local -a cmd groups + _pacman_get_command + groups=($(pacman -Sg)) + typeset -U groups + _wanted groups expl "groups" _values -s "," compadd - "${(@)groups}" +} + # provides completions for package groups _pacman_completions_installed_groups() { local -a cmd groups -- 1.6.5.6

1 0