July 2008 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix vercmp and add additional tests
by Dan McGee 25 Jul '08

25 Jul '08

This vercmp issue has been a sticking point but this should resolve many of the issues that have come up. Only a few minor code changes were necessary to get the behavior we desired, and this version appears to beat any other vercmp rendition on a few more cases added in this commit. This commit passes all 58 vercmp tests currently out there. Other 'fixes' still fail on a few tests, namely these ones: test: ver1: 1.5.a ver2: 1.5 ret: -1 expected: 1 ==> FAILURE test: ver1: 1.5 ver2: 1.5.a ret: 1 expected: -1 ==> FAILURE test: ver1: 1.5-1 ver2: 1.5.b ret: 1 expected: -1 ==> FAILURE test: ver1: 1.5.b ver2: 1.5-1 ret: -1 expected: 1 ==> FAILURE 4 of 58 tests failed Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Xavier- I had to get this fixed somehow. :) The challenge is back to you. -Dan doc/pacman.8.txt | 2 +- lib/libalpm/package.c | 26 ++++++++++++++------------ pactest/vercmptest.sh | 36 +++++++++++++++++++++++++++++++++--- 3 files changed, 48 insertions(+), 16 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 9e56a54..0a632ea 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -67,7 +67,7 @@ You can also use `pacman -Su` to upgrade all packages that are out of date. See to determine which packages need upgrading. This behavior operates as follows: Alphanumeric: - 1.0 < 1.0a < 1.0alpha < 1.0b < 1.0beta < 1.0p < 1.0pre < 1.0rc + 1.0a < 1.0alpha < 1.0b < 1.0beta < 1.0p < 1.0pre < 1.0rc < 1.0 Numeric: 1 < 1.0 < 1.1 < 1.1.1 < 1.2 < 2.0 < 3.0.0 diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 124d89a..13d0ae3 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -691,17 +691,13 @@ int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b) if(*ptr1 == '-' && *ptr2 == '-') { /* no-op, continue comparing since we are equivalent throughout */ } else if(*ptr1 == '-') { - /* ptr1 has hit the pkgrel and ptr2 has not. - * version 2 is newer iff we are not at the end of ptr2; - * if we are at end then one version had pkgrel and one did not */ - ret = *ptr2 ? -1 : 0; - goto cleanup; + /* ptr1 has hit the pkgrel and ptr2 has not. continue version + * comparison after stripping the pkgrel from ptr1. */ + *ptr1 = '\0'; } else if(*ptr2 == '-') { - /* ptr2 has hit the pkgrel and ptr1 has not. - * version 1 is newer iff we are not at the end of ptr1; - * if we are at end then one version had pkgrel and one did not */ - ret = *ptr1 ? 1 : 0; - goto cleanup; + /* ptr2 has hit the pkgrel and ptr1 has not. continue version + * comparison after stripping the pkgrel from ptr2. */ + *ptr2 = '\0'; } } @@ -713,8 +709,14 @@ int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b) goto cleanup; } - /* whichever version still has characters left over wins */ - if (!*one) { + /* the final showdown. we never want a remaining alpha string to + * beat an empty string. the logic is a bit weird, but: + * - if one is empty and two is not an alpha, two is newer. + * - if one is an alpha, two is newer. + * - otherwise one is newer. + * */ + if ( ( !*one && !isalpha((int)*two) ) + || isalpha((int)*one) ) { ret = -1; } else { ret = 1; diff --git a/pactest/vercmptest.sh b/pactest/vercmptest.sh index f8d457e..e36bf4b 100755 --- a/pactest/vercmptest.sh +++ b/pactest/vercmptest.sh @@ -26,8 +26,9 @@ failure=0 # args: # pass ver1 ver2 ret expected pass() { - echo "test: ver1: $1 ver2: $2 ret: $3 expected: $4" - echo " --> pass" + #echo "test: ver1: $1 ver2: $2 ret: $3 expected: $4" + #echo " --> pass" + echo -n } # args: @@ -54,13 +55,20 @@ runtest() { ret=$($bin $2 $1) func='pass' [ $ret -eq $reverse ] || func='fail' - $func $1 $2 $ret $reverse + $func $2 $1 $ret $reverse total=$(expr $total + 1) } # use first arg as our binary if specified [ -n "$1" ] && bin="$1" +if [ ! -x "$bin" ]; then + echo "vercmp binary ($bin) could not be located" + exit 1 +fi + +echo "Beginning vercmp tests" + # BEGIN TESTS # all similar length, no pkgrel @@ -88,6 +96,28 @@ runtest 1.1-1 1.1 0 runtest 1.0-1 1.1 -1 runtest 1.1-1 1.0 1 +# alphanumeric versions +runtest 1.5b-1 1.5-1 -1 +runtest 1.5b 1.5 -1 +runtest 1.5b-1 1.5 -1 +runtest 1.5b 1.5.1 -1 + +# from the manpage +runtest 1.0a 1.0alpha -1 +runtest 1.0alpha 1.0b -1 +runtest 1.0b 1.0beta -1 +runtest 1.0beta 1.0rc -1 +runtest 1.0rc 1.0 -1 + +# going crazy? alpha-dotted versions +runtest 1.5.a 1.5 1 +runtest 1.5.b 1.5.a 1 +runtest 1.5.1 1.5.b 1 + +# alpha dots and dashes +runtest 1.5.b-1 1.5.b 0 +runtest 1.5-1 1.5.b -1 + #END TESTS echo -- 1.5.6.4

3 5

[pacman-dev] [PATCH] makepkg: Add used options to PKGINFO file
by Allan McRae 25 Jul '08

25 Jul '08

Adds defined options to the PKGINFO file in the form of "makepkgopt =". It may be useful to be able to add these to the pacman DB at some point as that would allow (e.g.) checking which packages have had their docs striped (FS#7092). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 379e9d8..5bed00e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -823,6 +823,16 @@ create_package() { for it in "${backup[@]}"; do echo "backup = $it" >>.PKGINFO done + for it in "${known_options[@]}"; do + local ret="$(check_option $it)" + if [ "$ret" != "?" ]; then + if [ "$ret" = "y" ]; then + echo "makepkgopt = $it" >>.PKGINFO + else + echo "makepkgopt = !$it" >>.PKGINFO + fi + fi + done # TODO maybe remove this at some point # warn if license array is not present or empty -- 1.5.6.4

3 8

[pacman-dev] [PATCH] Remove unused strverscmp substitute
by Dan McGee 25 Jul '08

25 Jul '08

Our internal vercmp function was the only user of this, and it no longer relies on it. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- configure.ac | 2 +- lib/libalpm/util.c | 102 ---------------------------------------------------- lib/libalpm/util.h | 3 -- 3 files changed, 1 insertions(+), 106 deletions(-) diff --git a/configure.ac b/configure.ac index b4b6a56..37fcab5 100644 --- a/configure.ac +++ b/configure.ac @@ -170,7 +170,7 @@ AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK AC_FUNC_MKTIME AC_TYPE_SIGNAL AC_CHECK_FUNCS([geteuid realpath regcomp strcasecmp \ - strndup strrchr strsep strverscmp swprintf \ + strndup strrchr strsep swprintf \ wcwidth uname]) # Enable large file support if available diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 9199545..c38dfb5 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -48,108 +48,6 @@ #include "alpm_list.h" #include "md5.h" -#ifndef HAVE_STRVERSCMP -/* GNU's strverscmp() function, taken from glibc 2.3.2 sources - */ - -/* Compare strings while treating digits characters numerically. - Copyright (C) 1997, 2002 Free Software Foundation, Inc. - Contributed by Jean-François Bignolles <bignolle(a)ecoledoc.ibp.fr>, 1997. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. -*/ - -/* states: S_N: normal, S_I: comparing integral part, S_F: comparing - fractionnal parts, S_Z: idem but with leading Zeroes only */ -#define S_N 0x0 -#define S_I 0x4 -#define S_F 0x8 -#define S_Z 0xC - -/* result_type: CMP: return diff; LEN: compare using len_diff/diff */ -#define CMP 2 -#define LEN 3 - -/* Compare S1 and S2 as strings holding indices/version numbers, - returning less than, equal to or greater than zero if S1 is less than, - equal to or greater than S2 (for more info, see the texinfo doc). -*/ - -int strverscmp (s1, s2) - const char *s1; - const char *s2; -{ - const unsigned char *p1 = (const unsigned char *) s1; - const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - int state; - int diff; - - /* Symbol(s) 0 [1-9] others (padding) - Transition (10) 0 (01) d (00) x (11) - */ - static const unsigned int next_state[] = - { - /* state x d 0 - */ - /* S_N */ S_N, S_I, S_Z, S_N, - /* S_I */ S_N, S_I, S_I, S_I, - /* S_F */ S_N, S_F, S_F, S_F, - /* S_Z */ S_N, S_F, S_Z, S_Z - }; - - static const int result_type[] = - { - /* state x/x x/d x/0 x/- d/x d/d d/0 d/- - 0/x 0/d 0/0 0/- -/x -/d -/0 -/- */ - - /* S_N */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, - CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, - /* S_I */ CMP, -1, -1, CMP, +1, LEN, LEN, CMP, - +1, LEN, LEN, CMP, CMP, CMP, CMP, CMP, - /* S_F */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, - CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, - /* S_Z */ CMP, +1, +1, CMP, -1, CMP, CMP, CMP, - -1, CMP, CMP, CMP - }; - - if (p1 == p2) - return 0; - - c1 = *p1++; - c2 = *p2++; - /* Hint: '0' is a digit too. */ - state = S_N | ((c1 == '0') + (isdigit (c1) != 0)); - - while ((diff = c1 - c2) == 0 && c1 != '\0') - { - state = next_state[state]; - c1 = *p1++; - c2 = *p2++; - state |= (c1 == '0') + (isdigit (c1) != 0); - } - - state = result_type[state << 2 | (((c2 == '0') + (isdigit (c2) != 0)))]; - - switch (state) - { - case CMP: - return diff; - - case LEN: - while (isdigit (*p1++)) - if (!isdigit (*p2++)) - return 1; - - return isdigit (*p2) ? -1 : diff; - - default: - return state; - } -} -#endif - #ifndef HAVE_STRSEP /* This is a replacement for strsep which is not portable (missing on Solaris). * Copyright (c) 2001 by François Gouget <fgouget_at_codeweavers.com> */ diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 6c7a05e..a05a3e5 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -73,9 +73,6 @@ int _alpm_lstat(const char *path, struct stat *buf); int _alpm_test_md5sum(const char *filepath, const char *md5sum); char *_alpm_archive_fgets(char *line, size_t size, struct archive *a); -#ifndef HAVE_STRVERSCMP -int strverscmp(const char *, const char *); -#endif #ifndef HAVE_STRSEP char *strsep(char **, const char *); #endif -- 1.5.6.4

2 4

[pacman-dev] [PATCH] libalpm/package.c : fix infolevel bug in pkg_dup
by Xavier Chantry 25 Jul '08

25 Jul '08

The pkg_dup function shouldn't call any alpm_pkg_get_ accessors because this can fill the old package with all INFRQ_DESC fields for example, and this won't necessarily be reproduced in the new package (for all the fields that were copied before). Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- lib/libalpm/package.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index e7d3ec1..348ed45 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -778,19 +778,18 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) newpkg->force = pkg->force; newpkg->reason = pkg->reason; - newpkg->licenses = alpm_list_strdup(alpm_pkg_get_licenses(pkg)); - newpkg->replaces = alpm_list_strdup(alpm_pkg_get_replaces(pkg)); - newpkg->groups = alpm_list_strdup(alpm_pkg_get_groups(pkg)); - newpkg->files = alpm_list_strdup(alpm_pkg_get_files(pkg)); - newpkg->backup = alpm_list_strdup(alpm_pkg_get_backup(pkg)); - for(i = alpm_pkg_get_depends(pkg); i; i = alpm_list_next(i)) { + newpkg->licenses = alpm_list_strdup(pkg->licenses); + newpkg->replaces = alpm_list_strdup(pkg->replaces); + newpkg->groups = alpm_list_strdup(pkg->groups); + newpkg->files = alpm_list_strdup(pkg->files); + newpkg->backup = alpm_list_strdup(pkg->backup); + for(i = pkg->depends; i; i = alpm_list_next(i)) { newpkg->depends = alpm_list_add(newpkg->depends, _alpm_dep_dup(i->data)); } - newpkg->optdepends = alpm_list_strdup(alpm_pkg_get_optdepends(pkg)); - newpkg->conflicts = alpm_list_strdup(alpm_pkg_get_conflicts(pkg)); - newpkg->provides = alpm_list_strdup(alpm_pkg_get_provides(pkg)); - newpkg->deltas = alpm_list_copy_data(alpm_pkg_get_deltas(pkg), - sizeof(pmdelta_t)); + newpkg->optdepends = alpm_list_strdup(pkg->optdepends); + newpkg->conflicts = alpm_list_strdup(pkg->conflicts); + newpkg->provides = alpm_list_strdup(pkg->provides); + newpkg->deltas = alpm_list_copy_data(pkg->deltas, sizeof(pmdelta_t)); /* internal */ newpkg->origin = pkg->origin; -- 1.5.6.4

2 1

[pacman-dev] [PATCH] src/pacman : rework the display_targets function.
by Xavier Chantry 25 Jul '08

25 Jul '08

We had a lot of duplicated code here. The code handling the showsize option needed to be there three times : 1) for install part of -S 2) for remove part of -S (conflict removal) 3) for -R This patch introduce a new display_targets(pkglist, install) function which can handle the 3 cases above. We pass install == 1 for case 1), and install == 0 for case 2) and 3). Now we can finally get the benefit of an old patch which handled the ShowSize option consistently in the 3 cases above, without an awful lot of duplicated code : http://www.archlinux.org/pipermail/pacman-dev/2008-January/011029.html Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- src/pacman/query.c | 2 +- src/pacman/remove.c | 15 +++----- src/pacman/sync.c | 2 +- src/pacman/util.c | 100 ++++++++++++++++++++++++++++----------------------- src/pacman/util.h | 3 +- 5 files changed, 64 insertions(+), 58 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index bd2d8c5..d899539 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -261,7 +261,7 @@ static int query_upgrades(void) return(-1); } if(syncpkgs) { - display_targets(syncpkgs, db_local); + display_synctargets(syncpkgs); return(0); } diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 83947ca..f091fa4 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -125,21 +125,16 @@ int pacman_remove(alpm_list_t *targets) if(config->flags & PM_TRANS_FLAG_RECURSE || config->flags & PM_TRANS_FLAG_CASCADE) { /* list transaction targets */ - alpm_list_t *lst = NULL; - /* create a new list of package names only */ - for(i = alpm_trans_get_pkgs(); i; i = alpm_list_next(i)) { - pmpkg_t *pkg = alpm_list_getdata(i); - lst = alpm_list_add(lst, strdup(alpm_pkg_get_name(pkg))); - } + alpm_list_t *pkglist = alpm_trans_get_pkgs(); + + display_targets(pkglist, 0); printf("\n"); - list_display(_("Targets:"), lst); - FREELIST(lst); + /* get confirmation */ - if(yesno(1, _("\nDo you want to remove these packages?")) == 0) { + if(yesno(1, _("Do you want to remove these packages?")) == 0) { retval = 1; goto cleanup; } - printf("\n"); } /* Step 3: actually perform the removal */ diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 87bd5be..8d0c529 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -669,7 +669,7 @@ static int sync_trans(alpm_list_t *targets) if(!(alpm_trans_get_flags() & PM_TRANS_FLAG_PRINTURIS)) { int confirm; - display_targets(packages, db_local); + display_synctargets(packages); printf("\n"); if(config->op_s_downloadonly) { diff --git a/src/pacman/util.c b/src/pacman/util.c index d7ac9e3..efe8e6a 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -480,49 +480,33 @@ void list_display(const char *title, const alpm_list_t *list) } } -/* Display a list of transaction targets. - * `pkgs` should be a list of pmsyncpkg_t's, - * retrieved from a transaction object - */ -/* TODO move to output.c? or just combine util and output */ -void display_targets(const alpm_list_t *syncpkgs, pmdb_t *db_local) +/* prepare a list of pkgs to display */ +void display_targets(const alpm_list_t *pkgs, int install) { char *str; - const alpm_list_t *i, *j; - alpm_list_t *targets = NULL, *to_remove = NULL; - /* TODO these are some messy variable names */ - off_t isize = 0, rsize = 0, dispsize = 0, dlsize = 0; - double mbisize = 0.0, mbrsize = 0.0, mbdispsize = 0.0, mbdlsize = 0.0; - - for(i = syncpkgs; i; i = alpm_list_next(i)) { - pmsyncpkg_t *sync = alpm_list_getdata(i); - pmpkg_t *pkg = alpm_sync_get_pkg(sync); - - /* The removes member contains a list of packages to be removed - * due to the package that is being installed. */ - alpm_list_t *to_replace = alpm_sync_get_removes(sync); + const alpm_list_t *i; + off_t isize = 0, dlsize = 0; + double mbisize = 0.0, mbdlsize = 0.0; + alpm_list_t *targets = NULL; - for(j = to_replace; j; j = alpm_list_next(j)) { - pmpkg_t *rp = alpm_list_getdata(j); - const char *name = alpm_pkg_get_name(rp); + if(!pkgs) { + return; + } - if(!alpm_list_find_str(to_remove, name)) { - rsize += alpm_pkg_get_isize(rp); - to_remove = alpm_list_add(to_remove, strdup(name)); - } - } + printf("\n"); + for(i = pkgs; i; i = alpm_list_next(i)) { + pmpkg_t *pkg = alpm_list_getdata(i); - dispsize = alpm_pkg_get_size(pkg); dlsize += alpm_pkg_download_size(pkg); isize += alpm_pkg_get_isize(pkg); /* print the package size with the output if ShowSize option set */ if(config->showsize) { - /* Convert byte size to MB */ - mbdispsize = dispsize / (1024.0 * 1024.0); + double mbsize = 0.0; + mbsize = alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); asprintf(&str, "%s-%s [%.2f MB]", alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg), mbdispsize); + alpm_pkg_get_version(pkg), mbsize); } else { asprintf(&str, "%s-%s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); @@ -531,29 +515,55 @@ void display_targets(const alpm_list_t *syncpkgs, pmdb_t *db_local) } /* Convert byte sizes to MB */ - mbisize = isize / (1024.0 * 1024.0); - mbrsize = rsize / (1024.0 * 1024.0); mbdlsize = dlsize / (1024.0 * 1024.0); + mbisize = isize / (1024.0 * 1024.0); - /* start displaying information */ - printf("\n"); - - if(to_remove) { - list_display(_("Remove:"), to_remove); + if(install) { + list_display(_("Targets:"), targets); printf("\n"); - FREELIST(to_remove); - printf(_("Total Removed Size: %.2f MB\n"), mbrsize); + printf(_("Total Download Size: %.2f MB\n"), mbdlsize); + printf(_("Total Installed Size: %.2f MB\n"), mbisize); + } else { + list_display(_("Remove:"), targets); printf("\n"); + + printf(_("Total Removed Size: %.2f MB\n"), mbisize); } - list_display(_("Targets:"), targets); - printf("\n"); + FREELIST(targets); +} - printf(_("Total Download Size: %.2f MB\n"), mbdlsize); - printf(_("Total Installed Size: %.2f MB\n"), mbisize); +/* Display a list of transaction targets. + * `pkgs` should be a list of pmsyncpkg_t's, + * retrieved from a transaction object + */ +void display_synctargets(const alpm_list_t *syncpkgs) +{ + const alpm_list_t *i, *j; + alpm_list_t *pkglist = NULL, *rpkglist = NULL; - FREELIST(targets); + for(i = syncpkgs; i; i = alpm_list_next(i)) { + pmsyncpkg_t *sync = alpm_list_getdata(i); + pmpkg_t *pkg = alpm_sync_get_pkg(sync); + pkglist = alpm_list_add(pkglist, pkg); + + /* The removes member contains a list of packages to be removed + * due to the package that is being installed. */ + alpm_list_t *to_replace = alpm_sync_get_removes(sync); + + for(j = to_replace; j; j = alpm_list_next(j)) { + pmpkg_t *rp = alpm_list_getdata(j); + rpkglist = alpm_list_add(rpkglist, rp); + } + } + + /* start displaying information */ + display_targets(rpkglist, 0); + display_targets(pkglist, 1); + + alpm_list_free(pkglist); + alpm_list_free(rpkglist); } /* presents a prompt and gets a Y/N answer */ diff --git a/src/pacman/util.h b/src/pacman/util.h index 722e4ab..2ddc1b5 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -51,7 +51,8 @@ char *strreplace(const char *str, const char *needle, const char *replace); alpm_list_t *strsplit(const char *str, const char splitchar); void string_display(const char *title, const char *string); void list_display(const char *title, const alpm_list_t *list); -void display_targets(const alpm_list_t *syncpkgs, pmdb_t *db_local); +void display_targets(const alpm_list_t *pkgs, int install); +void display_synctargets(const alpm_list_t *syncpkgs); int yesno(short preset, char *fmt, ...); int pm_printf(pmloglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_fprintf(FILE *stream, pmloglevel_t level, const char *format, ...) __attribute__((format(printf,3,4))); -- 1.5.6.4

1 1

[pacman-dev] [PATCH] Implement AND based package searching.
by Xavier Chantry 25 Jul '08

25 Jul '08

This fixes FS#2334. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- lib/libalpm/db.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 0be81cb..3dfd3bf 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -357,6 +357,7 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles) { const alpm_list_t *i, *j, *k; alpm_list_t *ret = NULL; + alpm_list_t *list = alpm_list_copy(_alpm_db_get_pkgcache(db)); ALPM_LOG_FUNC; @@ -367,6 +368,7 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles) if(i->data == NULL) { continue; } + ret = NULL; targ = i->data; _alpm_log(PM_LOG_DEBUG, "searching for target '%s'\n", targ); @@ -374,7 +376,7 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles) RET_ERR(PM_ERR_INVALID_REGEX, NULL); } - for(j = _alpm_db_get_pkgcache(db); j; j = j->next) { + for(j = list; j; j = j->next) { pmpkg_t *pkg = j->data; const char *matched = NULL; const char *name = alpm_pkg_get_name(pkg); @@ -407,6 +409,8 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles) } } + alpm_list_free(list); + list = ret; regfree(&reg); } -- 1.5.6.4

1 0

[pacman-dev] awful bug in pkg_dup
by Xavier 24 Jul '08

24 Jul '08

I wasted two hours of my precious sleep while playing with the display targets and ShowSize code. Suppose you have a package loaded with INFRQ_BASE (only name and version), then you duplicate it with pkg_dup function. All this stuff is done first : newpkg->size = pkg->size; newpkg->isize = pkg->isize; newpkg->scriptlet = pkg->scriptlet; newpkg->force = pkg->force; newpkg->reason = pkg->reason; Then when calling this accessor and all the following ones: newpkg->licenses = alpm_list_strdup(alpm_pkg_get_licenses(pkg)); ... the INFRQ_DESC level will be loaded with all the infos, including the size / isize / etc stuff above. And finally we have this : newpkg->infolevel = pkg->infolevel; The amazing result is that you end up with a pkg with many empty fields, but with the INFRQ_DESC level. So once this is done, it is simply impossible to access all this precious information from the frontend. We should never ever use all these alpm_pkg_get accessors here, it doesn't make sense to fill a package while it is being duplicated.

1 0

[pacman-dev] [PATCH] Update NEWS file for 3.2.0 release
by Allan McRae 24 Jul '08

24 Jul '08

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- NEWS | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 5a9157a..6429695 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,81 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +3.2.0 + - many patches to greatly reduce memory usage + - added --asexplicit option + - new remove option --unneeded + - removed -A/--add option from pacman frontend + - add -Rss option to remove all dependencies + - removed useless -e/--dependsonly option + - config options are now case sensitive + - added CleanMethod option for variety in cache cleaning + - handle multiple groups in -Ss and -Qs operations + - allow -q/--quiet option with -o/--own option + - removed hack for packages with unknown installed size + - add SyncFirst option to pacman.conf + - add --enable-git-version configure flag to identify + developmental build version + - do not duplicate packages in required by list + - pacman.static is no longer built + - improve yesno function which removes need to translate + y/n all the time + - all error messages use pm_fprintf + - disable geteuid in cygwin + - use off_t type for large file support + - add vercmp test script + - moved gensync and updatesync to contrib + - rewrote pacsearch script in perl + - paclist script to list installed packages from a repo + - bacman script to make backup of package from filesystem + - combined repo-add and repo-remove to one script + - removed force option from repo-add + - add quiet option to repo-add/repo-remove + - update libtool version to 1.5.26 + - allow disabling of internal download with new configure + flag --disable-internal-download + - pactest can now check file permissions + - libalpm-specific changes: + - use dynamic string allocation in package structure + - new functions for manipulating pmdepend_t objects + - store replaces and force in local database + - moved deptest functionality to backend + - add alpm_checkdbconflicts function + - cleanup of conflict resolution + - removed synlist_free function + - fix PM_ERR_CONFLICTING_DEPS handling + - cleanup of pmsyncpkg_t + - add alpm_sync_newversion function + - removed alpm_sync_get_newversion function + - pmgraph_t struct and functions get their own header file + - cleanup of alpm_list code + - refactor of download code + - removed test_delta_md5sum and test_pkg_md5sum functions + - add alpm_version function + - avoid adding duplicate target names + - add _alpm_archive_fgets function to read line-by-line from + an archive + - read .PKGINFO directly from package file + - remove error.h header file + - refactor of _alpm_remove_prepare into two new functions + - native support for both libdownload and libfetch + - rework delta alogorithm + - swap parameters of alpm_pkg_find for consistency with + other find functions + - fix removing multiple items in dependency chain + - makepkg-specific changes: + - support for resuming source downloads + - added zipman option + - removed -b/--builddeps + - various portability fixes for BSD/Mac OSX + - check for valid options in PKGBUILD + - add --allsource option + - remove depreciated --usesudo option + - handle spaces in build directory + - made keeping docs the default option + - use pacman version dep resolving + - fix regression in library striping + - make the strip paths configurable + - MANY other bug fixes and small improvements 3.1.4 - various small code cleanups and fixes - small documentation updates - improvements to PKGBUILD.vim -- 1.5.6.4

7 14

[pacman-dev] [PATCH] added pactree
by Carlo Bersani 24 Jul '08

24 Jul '08

Pactree is a dependency tree viewer for installed packages. It features both textual and graphic (through graphviz) output. --- contrib/pactree | 314 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 314 insertions(+), 0 deletions(-) create mode 100755 contrib/pactree diff --git a/contrib/pactree b/contrib/pactree new file mode 100755 index 0000000..c186595 --- /dev/null +++ b/contrib/pactree @@ -0,0 +1,314 @@ +#!/bin/bash + +# here you can set the colors +branch1_color="\033[0;33m" #Brown +branch2_color="\033[0;37m" #Gray +leaf_color="\033[1;32m" #Light green +leaf2_color="\033[0;32m" #Green + +# here you can set the separators +separator=" " +branch_tip1="|--" +branch_tip2="+--" +provides="provides " + +# here you can set the graphviz options. +# http://www.graphviz.org/doc/info/output.html for available output formats +# http://www.graphviz.org/doc/info/colors.html for available colors +gformat="png" #output format +start_color="red" #START color +nodes_color="green" #color of the nodes +arrow1_color="chocolate4" #color of the normal arrow +arrow2_color="grey" #color of the "provided by" headless arrow + +########----------------END-OF-CONFIGURABLE-PART----------------####### + +# pactree : a simple dependency tree viewer +# +# Copyright (c) 2008 Carlo "carlocci" Bersani <carlocci(a)gmail.com> +# +# 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, see <http://www.gnu.org/licenses/>. +# + +# Original http://carlocci.ngi.it/arch/pactree +# Credit to scj for the graphviz idea + +####################################################################### +# User friendly part # +####################################################################### +readonly prog_name="pactree" +readonly prog_ver="0.2" + +_usage(){ + echo "This program generates the dependency tree of an installed package" + echo "Usage: $prog_name [OPTIONS] <installed packages>" + echo + echo " OPTIONS:" + echo " -c, --color Enable color output" + echo " -d, --depth INT Limit the shown dependencies depth" + echo " -g, --graph Use graphviz to make an image of the tree" + echo " -l, --linear Enable linear output" + echo " -s, --silent Shh, let me hear those errors!" + echo " -u, --unique Print the dependency list with no duplicates" + echo + echo " -h, --help Print this help message" + echo " -v, --version Print the program name and version" + echo + echo "Example: $prog_name -c -d 2 readline" +} + +_version(){ + echo "$prog_name version $prog_ver" + echo "Copyright (C) 2008 locci" +} +# end of the friendliness + + +####################################################################### +# grab a field from the database: $1=path/to/file, $2=field to grab # +####################################################################### +_grabfield(){ + for line in $(cat "$1" 2>/dev/null ); do + if [ -z "$line" ]; then + continue; + fi; + if [[ "$line" =~ %[A-Z]*% ]]; then + current="$line" + continue; + fi; + if [ "$current" = "$2" ]; then + echo "$line" + fi; + done +} + + +####################################################################### +# find a dep in the db: $1=dep, $2=field, $3=dbfile, ret=file list # +####################################################################### +_finddep(){ + for line in $(awk 'BEGIN{RS=""} {if ($1=="'"$2"'") {for (i=2 ; i<=NF ; ++i){ if ($i ~ /^'"$1"'([<>=]+.*|)$/ ) {print FILENAME}}}}' $(find $pac_db -name $3)); do + echo "${line%/*}" + done +} + + +####################################################################### +# Recursive function: does all of the work, pays all of the taxes # +####################################################################### +_tree(){ + pkg_name="$1" + pkg_dirs="$(echo $pac_db/$pkg_name-[0-9]*)" + + # Is $pkg_name real or provided? + [ ! -d "$pkg_dirs" ] && pkg_dirs="$(_finddep $pkg_name %PROVIDES% depends)" + + for pkg_dir in $pkg_dirs ; do + spaces="$2" + unset provided + branch_tip="$branch_tip1" + branch_color="$branch1_color" + pkg_name="$(_grabfield "$pkg_dir/desc" %NAME%)" + if [ ! "$pkg_name" = "$1" ]; then + provided="$leaf2_color $provides$leaf_color$1" + branch_tip="$branch_tip2" + branch_color="$branch2_color" + if [ $graphviz -eq 1 ] && [[ ! "${dep_list[@]}" =~ _$1_ ]] && [ $spaces -ne $((max_depth+1)) ]; then + echo "\"$1\" -> \"$pkg_name\" [arrowhead=none, color=$arrow2_color];" + dep_list=( "${dep_list[@]}" "_$1_" ) + _tree "$pkg_name" $((spaces+1)) + continue + fi + fi + + # Generate the spacer + spacer="" + for each in $(seq 1 $spaces); do + spacer="$spacer$separator" + done + spacer="$spacer$branch_tip" + + [ $silent -ne 1 ] && echo -e "$branch_color$spacer$leaf_color$pkg_name$provided" + + [ ! -d "$pkg_dir" ] && echo "No $pkg_name in the database (inconsistent database?)" >&2 + + if [[ ! " ${dep_list[@]} " =~ " $pkg_name " ]] && [ $spaces -ne $max_depth ]; then + dep_list=( "${dep_list[@]}" "$pkg_name" ) + for dep_pkg in $(_grabfield "$pkg_dir/depends" %DEPENDS%); do + spaces=$2 #Bash scoping ;_; + if [ $graphviz -eq 1 ]; then + echo "\"$1\" -> \"${dep_pkg%%[<>=]*}\" [color=$arrow1_color];" + fi + _tree "${dep_pkg%%[<>=]*}" $((spaces+1)) + done + fi + done + +} + + +####################################################################### +# Main program: gets all of the money, pays none of the taxes # +####################################################################### + +# Command line parameters parser -------------------------------------- +# --------------------------------------------------------------------- +if [ $# -eq 0 ]; then + _usage + exit 1 +fi + +options=( "$@" ) +len_options=${#options[@]} +for (( n=0 ; n < $len_options ; n++ )); do + if [ "${options[$n]}" = "--" ]; then + unset options[$n] + break + fi + if [ "${options[$n]}" = "-h" -o "${options[$n]}" = "--help" ]; then + _usage + exit 0 + fi + + if [ "${options[$n]}" = "-v" -o "${options[$n]}" = "--version" ]; then + _version + exit 0 + fi + + if [ "${options[$n]}" = "-l" -o "${options[$n]}" = "--linear" ]; then + unset options[$n] + linear=1 + continue + fi + + if [ "${options[$n]}" = "-s" -o "${options[$n]}" = "--silent" ]; then + unset options[$n] + silent=1 + continue + fi + + if [ "${options[$n]}" = "-u" -o "${options[$n]}" = "--unique" ]; then + unset options[$n] + silent=1 + nodup=1 + continue + fi + + if [ "${options[$n]}" = "-g" -o "${options[$n]}" = "--graph" ]; then + unset options[$n] + graphviz=1 + continue + fi + + if [ "${options[$n]}" = "-c" -o "${options[$n]}" = "--color" ]; then + unset options[$n] + colored=1 + continue + fi + + if [[ "${options[$n]}" =~ -d[[:digit:]]* || "${options[$n]}" == "--depth" ]]; then + if [[ "${options[$n]#-d}" =~ [[:digit:]]+ ]]; then + max_depth="${options[$n]#-d}" + elif [[ ${options[$((n+1))]} =~ [[:digit:]]+ ]]; then +# if [ ${options[$((n+1))]} -eq ${options[$((n+1))]} 2>/dev/null ]; then + max_depth="${options[$((n+1))]}" + unset options[$((n+1))] + ((++n)) + fi + unset options[$n] + continue + fi +done +# End of the dumb command line parser --------------------------------- + + +# Env ----------------------------------------------------------------- +# --------------------------------------------------------------------- +colored=${colored:-0} +max_depth=${max_depth:--10} +linear=${linear:-0} +silent=${silent:-0} +nodup=${nodup:-0} +graphviz=${graphviz:-0} + +if [ $colored -ne 1 ]; then + unset branch1_color + unset leaf_color + unset leaf2_color + unset branch2_color +fi + +if [ $linear -eq 1 ]; then + unset separator + unset branch_tip1 + unset branch_tip2 + unset provides +fi + +if [ $graphviz -eq 1 ]; then + silent=1 + nodup=0 + if [ ! -f /usr/bin/dot ]; then + echo "ERROR: package graphviz is not installed" + echo " Run pacman -S graphviz to install it" + exit 1 + fi +fi + +if [ ! -r /etc/pacman.conf ]; then + echo "ERROR: unable to read /etc/pacman.conf" + exit 1 +else + eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf) +fi + +pac_db="${DBPath:-/var/lib/pacman}/local" + +if [ ! -d "$pac_db" ] ; then + echo "ERROR: pacman database directory ${pac_db} not found" + exit 1 +fi +# Env End ------------------------------------------------------------- + +# Program starts ------------------------------------------------------ +# --------------------------------------------------------------------- + +_main(){ + for pkg_name in ${options[@]} ; do + [ $graphviz -eq 1 ] && echo -e "\"START\" -> \"$pkg_name\" ;" + _tree "$pkg_name" 0 + if [ $nodup -eq 1 ]; then + for pkg_tree in ${dep_list[@]} ; do + echo "$pkg_tree" + done + fi + done + if [ $silent -eq 0 ]; then + echo -ne '\033[0m' # return colors to normal? + echo -ne '\033[?25h' #return cursor to normal? + fi +} + + +if [ $graphviz -eq 1 ]; then + root_pkgs="${options[@]}" + # Uncomment for the "generated by pactree" node in graphviz + #advert="xyz [height=0.07, fontsize=8.0, label=\"GENERATED WITH PACTREE\",shape=box,color="black",style=filled,fontcolor="white"];\n" + + echo -e "digraph G { START [color=$start_color, style=filled];\n node [style=filled, color=$nodes_color];\n$(_main)\n$advert}" | dot -T$gformat -o "${root_pkgs// /_}.deps.$gformat" +else _main +fi +# Program Ends -------------------------------------------------------- + +# vim: set ts=2 sw=2 noet: -- 1.5.6.4

3 9

[pacman-dev] [PATCH] makepkg: add packages to pkgdeps list only after successful install
by Allan McRae 23 Jul '08

23 Jul '08

This fixed FS#9403. With this you can use "makepkg -sr", install the dependencies, Ctrl+c during the makedepends installation and have makepkg remove the installed packages on the exit. Previously makepkg tried to also remove the makedepends which were not installed. The deplist="" line in remove_deps is due to an obscure bug where local varaibles from the handle_deps function seem stay in scope because we never formally exited it. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ae19983..379e9d8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -362,11 +362,10 @@ resolve_deps() { local deplist="$(check_deps $*)" if [ "$deplist" = "" ]; then return $R_DEPS_SATISFIED - else - pkgdeps="$pkgdeps $deplist" fi if handledeps $deplist; then + pkgdeps="$pkgdeps $deplist" # check deps again to make sure they were resolved deplist="$(check_deps $*)" [ "$deplist" = "" ] && return $R_DEPS_SATISFIED @@ -390,6 +389,7 @@ remove_deps() { [ "$pkgdeps" = "" ] && return local dep depstrip deplist + deplist="" for dep in $pkgdeps; do depstrip=$(echo $dep | sed -e 's|=.*$||' -e 's|>.*$||' -e 's|<.*$||') deplist="$deplist $depstrip" -- 1.5.6.4

1 1