- Pacman-dev - lists.archlinux.org

Re: [pacman-dev] [PATCH] Improve changelog handling
by Xavier 09 Dec '07

09 Dec '07

On Sat, Dec 08, 2007 at 02:47:23AM +1000, Allan McRae wrote: > From 47affca982ec2d449bd6d96846172052dbdd3da6 Mon Sep 17 00:00:00 2001 > From: Allan McRae <mcrae_allan(a)hotmail.com> > Date: Sat, 8 Dec 2007 02:35:00 +1000 > Subject: [PATCH] Improve changelog handling > > Allows dumping of changelog for both installed packages and from package > files > (See FS#7321). Moves querying of changelog file in alpm backend. > > Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> > --- > lib/libalpm/alpm.h | 1 + > lib/libalpm/package.c | 71 > +++++++++++++++++++++++++++++++++++++++++++++++++ > src/pacman/package.c | 33 ++++++++++------------ > src/pacman/package.h | 2 +- > src/pacman/query.c | 9 +----- > 5 files changed, 89 insertions(+), 27 deletions(-) > > diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h > index 1e18ad9..7f6c9eb 100644 > --- a/lib/libalpm/alpm.h > +++ b/lib/libalpm/alpm.h > @@ -216,6 +216,7 @@ alpm_list_t *alpm_pkg_get_deltas(pmpkg_t *pkg); > alpm_list_t *alpm_pkg_get_replaces(pmpkg_t *pkg); > alpm_list_t *alpm_pkg_get_files(pmpkg_t *pkg); > alpm_list_t *alpm_pkg_get_backup(pmpkg_t *pkg); > +alpm_list_t *alpm_pkg_get_changelog(pmpkg_t *pkg); > unsigned short alpm_pkg_has_scriptlet(pmpkg_t *pkg); > > unsigned long alpm_pkg_download_size(pmpkg_t *newpkg, pmdb_t *db_local); > diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c > index 172456d..bbdb95d 100644 > --- a/lib/libalpm/package.c > +++ b/lib/libalpm/package.c > @@ -491,6 +491,77 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_backup(pmpkg_t > *pkg) > return pkg->backup; > } > > +alpm_list_t SYMEXPORT *alpm_pkg_get_changelog(pmpkg_t *pkg) > +{ > + ALPM_LOG_FUNC; > + > + /* Sanity checks */ > + ASSERT(handle != NULL, return(NULL)); > + ASSERT(pkg != NULL, return(NULL)); > + > + int ret = ARCHIVE_OK; > + alpm_list_t *cl = NULL; > + char clfile[PATH_MAX]; > + char *tmpfile = NULL; > + struct archive *archive; > + struct archive_entry *entry; > + int fd = -1; > + char line[PATH_MAX]; > + > + if(pkg->origin == PKG_FROM_CACHE) { > + snprintf(clfile, PATH_MAX, "%s/%s/%s-%s/changelog", > + alpm_option_get_dbpath(), > + alpm_db_get_name(alpm_db_register_local()), I believe you should use handle->db_local here rather than alpm_db_register_local(); > + alpm_pkg_get_name(pkg), > + alpm_pkg_get_version(pkg)); > + } else if(pkg->origin == PKG_FROM_FILE) { > + const char *pkgfile = pkg->origin_data.file; > + > + if((archive = archive_read_new()) == NULL) { > + RET_ERR(PM_ERR_LIBARCHIVE_ERROR, NULL); > + } > + > + archive_read_support_compression_all(archive); > + archive_read_support_format_all(archive); > + > + if (archive_read_open_filename(archive, pkgfile, > + ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { > + RET_ERR(PM_ERR_PKG_OPEN, NULL); > + } > + > + while((ret = archive_read_next_header(archive, &entry)) == > ARCHIVE_OK) { > + const char *entry_name = archive_entry_pathname(entry); > + > + if(strcmp(entry_name, ".CHANGELOG") == 0) { > + tmpfile = strdup("/tmp/alpm_XXXXXX"); > + fd = mkstemp(tmpfile); > + archive_read_data_into_fd(archive, fd); > + break; > + } > + } > + snprintf(clfile, PATH_MAX, "%s", tmpfile); > + } > + You probably got this part from _alpm_pkg_load, I guess it's alright (except you probably want to add an archive_read_finish(archive); there). But you could also use _alpm_unpack, like in _alpm_runscriptlet. Btw, I couldn't get your patch to apply cleanly, because of many line breaks. So I started rewriting it from the start, but in the same time, I wanted to experiment reading directly from the archive, which resulted in the patch I submitted somewhere else in this thread. I don't know if it's better or not, but if it is, all the credits still go to you, for looking at the problem in the first place, and providing a good patch to work with. So thanks again.

1 1

[pacman-dev] [PATCH] Add test directory for testing private libalpm functions.
by Nathan Jones 07 Dec '07

07 Dec '07

I found this useful when testing the shortest_delta_path code. Recently, I ran valgrind on the test which helped to discover the memory leak. Not sure if you guys will want to apply this, but here it is. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- Makefile.am | 2 +- configure.ac | 1 + lib/libalpm/test/.gitignore | 3 + lib/libalpm/test/Makefile.am | 47 +++++++++++++++++ lib/libalpm/test/deltatest.c | 112 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 164 insertions(+), 1 deletions(-) create mode 100644 lib/libalpm/test/.gitignore create mode 100644 lib/libalpm/test/Makefile.am create mode 100644 lib/libalpm/test/deltatest.c diff --git a/Makefile.am b/Makefile.am index e07321b..c68786a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc po pactest contrib +SUBDIRS = lib/libalpm lib/libalpm/test src/util src/pacman scripts doc etc po pactest contrib # Some files automatically included, so they aren't specified below: # AUTHORS, COPYING, NEWS, README diff --git a/configure.ac b/configure.ac index 9a5f3b3..f9f27a7 100644 --- a/configure.ac +++ b/configure.ac @@ -309,6 +309,7 @@ AC_DEFINE_UNQUOTED([DBEXT], "$DBEXT", [The file extension used by pacman databas AC_CONFIG_FILES([ lib/libalpm/Makefile lib/libalpm/po/Makefile.in +lib/libalpm/test/Makefile src/pacman/Makefile src/util/Makefile scripts/Makefile diff --git a/lib/libalpm/test/.gitignore b/lib/libalpm/test/.gitignore new file mode 100644 index 0000000..64ebea7 --- /dev/null +++ b/lib/libalpm/test/.gitignore @@ -0,0 +1,3 @@ +deltatest +.deps +.libs diff --git a/lib/libalpm/test/Makefile.am b/lib/libalpm/test/Makefile.am new file mode 100644 index 0000000..b033018 --- /dev/null +++ b/lib/libalpm/test/Makefile.am @@ -0,0 +1,47 @@ +AUTOMAKE_OPTIONS = gnu + +bin_PROGRAMS = deltatest + +DEFS = -DLOCALEDIR=\"@localedir@\" @DEFS@ + +AM_CFLAGS = -pedantic -D_GNU_SOURCE -I.. -I../../.. + +if ENABLE_VISIBILITY_CC +AM_CFLAGS += -fvisibility=internal +endif +if ENABLE_GNU89_INLINE_CC +AM_CFLAGS += -fgnu89-inline +endif + +deltatest_SOURCES = deltatest.c +deltatest_LDADD = ../.libs/libalpm.a + +libalpm_sources = \ + ../add.h ../add.c \ + ../alpm.h ../alpm.c \ + ../alpm_list.h ../alpm_list.c \ + ../backup.h ../backup.c \ + ../be_files.c ../\ + ../cache.h ../cache.c \ + ../conflict.h ../conflict.c \ + ../db.h ../db.c \ + ../delta.h ../delta.c \ + ../deps.h ../deps.c \ + ../error.h ../error.c \ + ../group.h ../group.c \ + ../handle.h ../handle.c \ + ../log.h ../log.c \ + ../md5.h ../md5.c \ + ../package.h ../package.c \ + ../remove.h ../remove.c \ + ../server.h ../server.c \ + ../sync.h ../sync.c \ + ../trans.h ../trans.c \ + ../util.h ../util.c + +all: ../.libs/libalpm.a + +../.libs/libalpm.a: $(libalpm_sources) + cd .. && make + +# vim:set ts=2 sw=2 noet: diff --git a/lib/libalpm/test/deltatest.c b/lib/libalpm/test/deltatest.c new file mode 100644 index 0000000..e2c3c2e --- /dev/null +++ b/lib/libalpm/test/deltatest.c @@ -0,0 +1,112 @@ +/* + * deltatest.c + * + * Copyright (c) 2007 by Judd Vinet <jvinet(a)zeroflux.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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ +#include "string.h" +#include "assert.h" + +#include "alpm.h" +#include "alpm_list.h" +#include "delta.h" + +int main() +{ + alpm_list_t *deltas = NULL, *path = NULL; + pmdelta_t d1, d2, d3, d4, d5; + + strcpy(d1.from, "1.0-1"); + strcpy(d1.to, "1.1-1"); + d1.size = 10000; + + strcpy(d2.from, "1.1-1"); + strcpy(d2.to, "1.2-1"); + d2.size = 12000; + + strcpy(d3.from, "1.2-1"); + strcpy(d3.to, "1.2-2"); + d3.size = 8000; + + strcpy(d4.from, "1.2-2"); + strcpy(d4.to, "1.3-1"); + d4.size = 15000; + + strcpy(d5.from, "1.0-1"); + strcpy(d5.to, "1.3-1"); + d5.size = 20000; + + deltas = alpm_list_add(deltas, &d1); + deltas = alpm_list_add(deltas, &d2); + deltas = alpm_list_add(deltas, &d3); + deltas = alpm_list_add(deltas, &d4); + deltas = alpm_list_add(deltas, &d5); + + /* test standard path */ + path = _alpm_shortest_delta_path(deltas, "1.0-1", "1.1-1"); + assert(alpm_list_count(path) == 1); + assert(_alpm_delta_path_size(path) == 10000); + alpm_list_free(path); + + path = _alpm_shortest_delta_path(deltas, "1.0-1", "1.2-1"); + assert(alpm_list_count(path) == 2); + assert(_alpm_delta_path_size(path) == 22000); + alpm_list_free(path); + + path = _alpm_shortest_delta_path(deltas, "1.0-1", "1.2-2"); + assert(alpm_list_count(path) == 3); + assert(_alpm_delta_path_size(path) == 30000); + alpm_list_free(path); + + path = _alpm_shortest_delta_path(deltas, "1.0-1", "1.3-1"); + assert(alpm_list_count(path) == 1); + assert(_alpm_delta_path_size(path) == 20000); + alpm_list_free(path); + + path = _alpm_shortest_delta_path(deltas, "1.2-2", "1.3-1"); + assert(alpm_list_count(path) == 1); + assert(_alpm_delta_path_size(path) == 15000); + alpm_list_free(path); + + path = _alpm_shortest_delta_path(deltas, "1.2-1", "1.3-1"); + assert(alpm_list_count(path) == 2); + assert(_alpm_delta_path_size(path) == 23000); + alpm_list_free(path); + + /* test no path */ + path = _alpm_shortest_delta_path(deltas, "0.9-1", "1.3-1"); + assert(alpm_list_count(path) == 0); + alpm_list_free(path); + + path = _alpm_shortest_delta_path(deltas, "1.0-1", "1.4-1"); + assert(alpm_list_count(path) == 0); + alpm_list_free(path); + + path = _alpm_shortest_delta_path(deltas, "0.9-1", "1.4-1"); + assert(alpm_list_count(path) == 0); + alpm_list_free(path); + + /* test reverse direction */ + path = _alpm_shortest_delta_path(deltas, "1.1-1", "1.0-1"); + assert(alpm_list_count(path) == 0); + alpm_list_free(path); + + alpm_list_free(deltas); + + return 0; +} + -- 1.5.3.7

3 2

Re: [pacman-dev] [PATCH] Improve changelog handling
by Xavier 07 Dec '07

07 Dec '07

On Sat, Dec 08, 2007 at 02:47:23AM +1000, Allan McRae wrote: > diff --git a/src/pacman/package.c b/src/pacman/package.c > index ac3f820..00c3535 100644 > --- a/src/pacman/package.c > +++ b/src/pacman/package.c > @@ -232,29 +232,26 @@ void dump_pkg_files(pmpkg_t *pkg) > fflush(stdout); > } > > -/* Display the changelog of an installed package > +/* Display the changelog of a package > */ > -void dump_pkg_changelog(char *clfile, const char *pkgname) > +void dump_pkg_changelog(pmpkg_t *pkg) > { > - FILE* fp = NULL; > - char line[PATH_MAX+1]; > - > - if((fp = fopen(clfile, "r")) == NULL) > - { > - fprintf(stderr, _("error: no changelog available for '%s'.\n"), > pkgname); > + alpm_list_t *changelog = NULL; > + alpm_list_t *i; > + char line[PATH_MAX]; > + > + changelog = alpm_pkg_get_changelog(pkg); > + if(changelog == NULL) { > + fprintf(stderr, _("error: no changelog available for '%s'.\n"), > alpm_pkg_get_name(pkg)); > return; > - } > - else > - { > - while(!feof(fp)) > - { > - fgets(line, (int)PATH_MAX, fp); > - printf("%s", line); > - line[0] = '\0'; > + } else { > + for(i = changelog; i; i = alpm_list_next(i)) { > + snprintf(line, PATH_MAX-1, "%s", (char*)alpm_list_getdata(i)); > + fprintf(stdout, "%s\n", line); > } > - fclose(fp); > - return; > } > + > + FREELIST(changelog); > } > Dan, you said earlier the FREELIST macros shouldn't be used in the frontend. I don't know why I said "ah, ok", because I actually don't understand this, and Nagy didn't either. There are several other places in the frontend where it could be used instead of alpm_list_free_inner(list, free); alpm_list_free(list);

2 3

[pacman-dev] [PATCH] Fix memory leak in shortest_delta_path.
by Nathan Jones 07 Dec '07

07 Dec '07

It is possible for the if statement to never succeed, causing path to never be freed. It is also possible for the if statement to succeed more than once per loop, which could have caused a segfault. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- lib/libalpm/delta.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 8daac0c..b59dd52 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -170,15 +170,15 @@ static alpm_list_t *shortest_delta_path(alpm_list_t *deltas, /* If this vertex has already been visited in the path, go to the * next vertex. */ - if(alpm_list_find_ptr(path, v)) + if(alpm_list_find_ptr(path, v)) { continue; + } /* Once we find a vertex that starts at the 'from' version, * recursively find the shortest path using the 'to' version of this * current vertex as the 'from' version in the function call. */ if(strcmp(v->from, from) == 0) { alpm_list_t *newpath = alpm_list_copy(path); - alpm_list_free(path); newpath = alpm_list_add(newpath, v); newpath = shortest_delta_path(deltas, v->to, to, newpath); @@ -197,6 +197,8 @@ static alpm_list_t *shortest_delta_path(alpm_list_t *deltas, } } + alpm_list_free(path); + return(shortest); } -- 1.5.3.7

1 0

[pacman-dev] [BUG] segfault when the download fails
by Xavier 07 Dec '07

07 Dec '07

I believe my mirror gave me a way to reproduce easily the issue Nagy described there : http://bugs.archlinux.org/task/8350#comment20223 However, it doesn't look at all like the output in the original bug report, where the progress bar is at 64%. So I wasn't sure where to report this information, so I'm reporting it here for now before investigating further. Here is the --debug output: Targets: hunspell-1.2.1-2 openoffice-fr-2.3.1-1 Total Download Size: 15.08 MB [00:27:01] debug: using cachedir: /var/cache/pacman/pkg/ :: Retrieving packages from extra... error: Internal pacman error: Segmentation fault. Please submit a full bug report with --debug if appropriate. [00:27:01] debug: using 'hunspell-1.2.1-2-i686.pkg.tar.gz' for download progress [00:27:01] debug: connected to mir1.archlinuxfr.org successfully [00:27:02] debug: using 'openoffice-fr-2.3.1-1-i686.pkg.tar.gz' for download progress [00:27:02] error: failed retrieving file 'openoffice-fr-2.3.1-1-i686.pkg.tar.gz' from mir1.archlinuxfr.org : Not Found [00:27:02] debug: using 'hunspell-1.2.1-2-i686.pkg.tar.gz' for download progress [00:27:02] error: segmentation fault So pacman first downloads hunspell-1.2.1-2-i686.pkg.tar.gz and succeeds, then it tries to download openoffice-fr-2.3.1-1-i686.pkg.tar.gz and fails. So after that, it tries using the second server in the list. It starts with hunspell-1.2.1-2-i686.pkg.tar.gz again, and then bam, segfault. While I'm finishing this mail, the bug is already gone, since that package is now available on my first mirror. But when it wasn't available, the issue was 100% reproducible, I made it happen 10 times in a row.

3 9

[pacman-dev] Directory permission checking in makepkg
by Allan McRae 06 Dec '07

06 Dec '07

Hi all, I was looking at bug FS#5908 [1] which asks for directory permissions to be checked somewhere in order to stop screwing your system when installing a poorly made package (as directory permissions get overwritten when extracting packages). This at first glance seems about a two line addition to the tidy_install function of makepkg. However, can anybody come up with a case where package directories shouldn't have 755 permissions? If so, I guess this would require either the addition of some option which would stop the directory permissions getting fixed (dirperm?) or just checking/fixing the permissions of a predetermined set of directories. If needed, which is preferable. Cheers, Allan [1] http://bugs.archlinux.org/task/5908

4 5

[pacman-dev] backup handling ugly mess
by Xavier 06 Dec '07

06 Dec '07

Following the recent bash breakage, Pierre was wondering why the /etc/profile just stayed there on the filesystem : http://www.archlinux.org/pipermail/arch-dev-public/2007-December/003556.html I didn't understand this at all. As stonecrest noted earlier, when the "current" mirrorlist was removed from pacman package, that file totally disappeared during the upgrade, even though it was in the old backup array : http://www.archlinux.org/pipermail/pacman-dev/2007-September/009376.html This caused the following commit : http://projects.archlinux.org/git/?p=pacman.git;a=commitdiff;h=843d368ef60a… The first part of this commit is supposed to temporarily add all old backup entries (besides the new) to the NoUpgrade array. Because of a bug, it didn't have any effect. The second part was an idea of me to handle the pacsave during an removeupgrade just like we already did for a remove, but I finally think this is a really stupid / misleading / confusing idea. This code shouldn't even be reached during a removeupgrade if the first part was fixed anyway. So that was just a little sum up, now description of the bug: alpm_pkg_get_backup(newpkg) : newpkg is the one that will be installed, so this only return a list of elements like "file" alpm_pkg_get_backup(oldpkg) : oldpkg is a locally installed package, so this return a list of elements like "file<tab>md5sum" Since the md5sum wasn't removed there, adding these files had 0 effect. Now, this can easily be fixed. But then all files in either old or new backup array that were in oldpkg but not in newpkg will just stay there on the filesystem. They won't be renamed to .pacsave . Why the bash case was different to the pacman one is that, even if /etc/profile was removed from the newpkg, it was still in the backup array of the newpkg (which is the only one pacman looks at). So the file wasn't removed and was just left on the filesystem. Even though the bash case is a packaging error, it's a real case that happened, so it might be worth adding it to the pactests.

3 7

[pacman-dev] [PATCH] Update zsh completion.
by Nathan Jones 06 Dec '07

06 Dec '07

Update zsh completion file to version 0.5-2 from AUR and add the new options in pacman 3.1. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- contrib/zsh_completion | 85 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 64 insertions(+), 21 deletions(-) diff --git a/contrib/zsh_completion b/contrib/zsh_completion index 07cd422..f6cd900 100644 --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -1,6 +1,6 @@ -# file: /usr/share/zsh/site-functions/_pacman -# use the following in your zsh config: -# compdef pacman pacman.static=pacman +#compdef pacman pacman.static=pacman + +# copy this file to /usr/share/zsh/site-functions/_pacman typeset -A opt_args @@ -21,11 +21,15 @@ _pacman_opts_common=( '-h[Display syntax for the given operation]' '-r[Set alternate installation root]:installation root:_files -/' '-v[Be more verbose]' + '--cachedir[Alternate package cache location]:cache_location:_files -/' '--config[An alternate configuration file]:config file:_files' + '--logfile[An alternate log file]:config file:_files' '--noconfirm[Do not ask for confirmation]' + '--noprogressbar[Do not show a progress bar when downloading files]' + '--noscriptlet[Do not execute the install scriptlet if one exists]' ) -# options for passing to _arguments: options for --add, and --update commands +# options for passing to _arguments: options for --add and --update commands _pacman_opts_pkgfile=( '-d[Skip dependency checks]' '-f[Overwrite conflicting files]' @@ -43,8 +47,16 @@ _pacman_opts_query_actions=( # options for passing to _arguments: options for --query and subcommands _pacman_opts_query_modifiers=( + '-c[List package changelog]' + '-d[List packages installed as dependencies]' + '-e[List packages explicitly installed]' + '-g[List all members of a package group]' '-i[View package information]' + '-ii[View package information including backup files]' '-l[List package contents]' + '-m[List installed packages not found in sync db(s)]' + '-t[List packages not required by any package]' + '-u[List packages that can be upgraded]' ) # options for passing to _arguments: options for --remove command @@ -60,6 +72,7 @@ _pacman_opts_remove=( # options for passing to _arguments: options for --sync command _pacman_opts_sync_actions=( '*-c[Remove old packages from cache]:*:clean:->sync_clean' + '*-cc[Remove all packages from cache]:*:clean:->sync_clean' '-g[View all members of a package group]:*:package groups:->sync_group' '-s[Search package names and descriptions]:*:search text:->sync_search' ) @@ -67,6 +80,7 @@ _pacman_opts_sync_actions=( # options for passing to _arguments: options for --sync command _pacman_opts_sync_modifiers=( '-d[Skip dependency checks]' + '-e[Install dependencies only]' '-f[Overwrite conflicting files]' '-i[View package information]' '-l[List all packages in a repository]' @@ -76,6 +90,7 @@ _pacman_opts_sync_modifiers=( '-y[Download fresh package databases]' '*--ignore[Ignore a package upgrade]:package:_pacman_completions_installed_packages' '*--ignoregroup[Ignore a group upgrade]:package group:_pacman_completions_all_groups' + '--asdeps[Install packages as non-explicitly installed]' ) # handles --action subcommand @@ -209,43 +224,57 @@ _pacman_action_version() { _pacman_completions_all_groups() { local -a cmd groups _pacman_get_command - groups=( $(_call_program groups $cmd[@] -Sg | grep -e \^$PREFIX) ) + groups=( $(_call_program groups $cmd[@] -Sg) ) compadd "$@" -a groups } # provides completions for packages available from repositories +# these can be specified as either 'package' or 'repository/package' _pacman_completions_all_packages() { - local -a cmd packages repositories + local -a cmd packages repositories packages_long - repositories=( $(_call_program repositories cat /etc/pacman.conf | grep "^\[" | sed "s,$\[\|\]$,,g" | grep -v "^options" | sort -u) ) - # these can be specified as either 'package' or 'repository/package' - if [[ "$PREFIX" == "" ]] ; then - packages=( $(_call_program packages ls /var/lib/pacman/sync/${^repositories} | grep -v "^/" | sed "s,\-[^-]*\-[^-]*$,," | sort -u) ) + 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" compadd - "${(@)packages}" + if [[ $PREFIX != */* ]] ; then + repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + typeset -U repositories + _wanted repo_packages expl "repository/package" compadd -S "/" $repositories else - packages=( $(_call_program packages ls /var/lib/pacman/sync/${^repositories} | grep -v "^/" | grep -e \^$PREFIX | sed "s,\-[^-]*\-[^-]*$,," | sort -u) ) + compset -P '*/' + packages_long=(/var/lib/pacman/sync/$IPREFIX*(/)) + packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + typeset -U packages + _wanted repo_packages expl "repository/package" compadd ${(@)packages} fi - compadd "$@" -a packages } # provides completions for package groups _pacman_completions_installed_groups() { local -a cmd groups _pacman_get_command - groups=( $(_call_program installed_groups $cmd[@] -Qg | cut -d' ' -f1 | grep -e \^$PREFIX | sort -u) ) + groups=(${(o)${(f)"$(pacman -Qg)"}% *}) + typeset -U groups compadd "$@" -a groups } # provides completions for installed packages _pacman_completions_installed_packages() { - local -a cmd packages - packages=( $(_call_program installed_packages ls /var/lib/pacman/local | grep "^$PREFIX" | sed "s,\-[^-]*\-[^-]*$,,") ) + local -a cmd packages packages_long + packages_long=(/var/lib/pacman/local/*(/)) + packages=( ${${packages_long/\/var\/lib\/pacman\/local\//}%-*-*} ) compadd "$@" -a packages } # provides completions for repository names _pacman_completions_repositories() { local -a cmd repositories - repositories=( $(_call_program repositories cat /etc/pacman.conf | grep "^\[" | sed "s,$\[\|\]$,,g" | grep -v "^options" | grep "^$PREFIX" | sort -u) ) + repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + # Uniq the array + typeset -U repositories compadd "$@" -a repositories } @@ -265,21 +294,32 @@ _pacman_get_command() { # main dispatcher _pacman() { + # First check if --ignoregroup was the last command given. If so, complete + # all groups. + if [ "$words[-2]" = "--ignoregroup" ]; then + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_sync_modifiers[@]" \ + '*:package group:_pacman_completions_all_groups' + return 0 + fi + + # Otherwise, complete on the given command. case $words[2] in -A*) _pacman_action_add ;; - -Qg) # ipkg groups + -Q*g*) # ipkg groups _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ '*:groups:_pacman_completions_installed_groups' ;; - -Qo) # file *.pkg.tar.gz + -Q*o*) # file *.pkg.tar.gz _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ '*:package file:_files' ;; - -Qp) # file *.pkg.tar.gz + -Q*p*) # file *.pkg.tar.gz _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ @@ -287,13 +327,16 @@ _pacman() { ;; -Q*) _pacman_action_query ;; -R*) _pacman_action_remove ;; - -Sl) # repos + -S*c*) # no completion + return 0 + ;; + -S*l*) # repos _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_sync_modifiers[@]" \ '*:package repo:_pacman_completions_repositories' \ ;; - -Sg) # pkg groups + -S*g*) # pkg groups _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_sync_modifiers[@]" \ -- 1.5.3.7

3 5

[pacman-dev] ignore question asked twice
by Xavier 05 Dec '07

05 Dec '07

On Tue, Dec 04, 2007 at 01:19:44PM +0100, Nagy Gabor wrote: > 3. commit 55a7455135e2d8f2e118928f634dc7976ab6c8b4 and asymmetric > search-for-satisfier caused a strange situation: > # pacman -S foo --ignore foo-dependency > "install foo-dependency anyway?" is asked twice, if this foo-dependency is a > literal satisfier, because in the search-for-provisions we use alpm_depcmp, > which finds literals again... Uh, I thought I couldn't reproduce this, because I was answering the default question (yes). Now I see, but I don't consider this to be a big problem. Why would you answer no to the question anyway? When you do, pacman will just fail.

2 2

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.0.6-656-g9615d82
by Dan McGee 05 Dec '07

05 Dec '07

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, maint has been updated via 9615d82343148301884bfc79d87e2f408aad64bd (commit) via 87d95f14f70cc133642db3041a2b3e78b5a74516 (commit) via afdf3724d9d5672c07adcf474d2850630e605167 (commit) via 874f3379ffe75582882a48b5d6b6533659750e7c (commit) via 665b61082ee52975e2dba657955e962ae5422a1e (commit) via f42e22338683b1478412a64a83bbffd6b1776aa0 (commit) via d6354ff248968a1eb1f3ac78441660d4c7a95b86 (commit) via 72dae726910bce78647fb47ccfbba657b229ffb4 (commit) via 0d1cb037566f3327315cf946d2443abb114b623a (commit) from f07a800fab2192dd64957bf2a30c71f6ccbe3592 (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 9615d82343148301884bfc79d87e2f408aad64bd Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Wed Dec 5 09:50:29 2007 +1000 Compress hard linked man pages This fixes FS#5392. If hard links are present for a man page, all other hard linked files are removed, the man page is zipped and the hard links are updated to the newly compress man page. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> [Dan: use find -samefile option, don't fail if one of mandirs is nonexistent] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 87d95f14f70cc133642db3041a2b3e78b5a74516 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Wed Dec 5 00:28:36 2007 +0100 libalpm/backup.c : simple refactoring. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit afdf3724d9d5672c07adcf474d2850630e605167 Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Tue Dec 4 21:31:37 2007 +0100 Updated Italian translation for pacman 3.1 Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> modified: po/it.po Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 874f3379ffe75582882a48b5d6b6533659750e7c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 4 09:56:28 2007 -0600 Update some errors in messages found during localization Also perform the updates in the message files so we don't break translations. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 665b61082ee52975e2dba657955e962ae5422a1e Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Dec 4 12:27:03 2007 +0100 Updated Hungarian translation Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f42e22338683b1478412a64a83bbffd6b1776aa0 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 3 22:50:33 2007 -0600 pacman/sync.c: mark sync_trans as static Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d6354ff248968a1eb1f3ac78441660d4c7a95b86 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 3 22:17:19 2007 -0600 Oops- forgot to ever set init to 1 in setlibpaths() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 72dae726910bce78647fb47ccfbba657b229ffb4 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Dec 3 22:57:54 2007 +0100 Delay output during progress bar This fixes the output issue related to the progress bar by delaying the output. We can decide later (post-release) if we like this method or we want to switch to something else. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> [Dan: just some minor cleanups] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0d1cb037566f3327315cf946d2443abb114b623a Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Mon Dec 3 11:50:55 2007 +0100 Update it translation for 3.1 Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/backup.c | 65 ++++++++++++--- lib/libalpm/backup.h | 2 + lib/libalpm/po/it.po | 59 +++++++------- po/de.po | 4 +- po/en_GB.po | 8 +- po/es.po | 4 +- po/fr.po | 4 +- po/hu.po | 170 ++++++++++++++++++---------------------- po/it.po | 210 ++++++++++++++++++++++-------------------------- po/pl_PL.po | 4 +- po/pt_BR.po | 4 +- po/ru_RU.po | 4 +- scripts/makepkg.sh.in | 40 +++++++--- src/pacman/callback.c | 32 +++++++- src/pacman/pacman.c | 5 +- src/pacman/sync.c | 2 +- src/pacman/util.c | 35 ++++++++ src/pacman/util.h | 1 + 18 files changed, 368 insertions(+), 285 deletions(-) hooks/post-receive -- The official pacman repository

1 0