- Pacman-dev - lists.archlinux.org

[pacman-dev] Final steps before 3.2 release
by Dan McGee 27 Jul '08

27 Jul '08

I think this is the only outstanding blocker: http://archlinux.org/pipermail/pacman-dev/2008-July/012465.html Thanks again for the quick translation updates and the NEWS updates you guys contributed. I will send a few patches from my working branch here for review, but does anyone have objections to anything I've included on it? If not, this will all go to master with a 3.2.0 tag soon to follow. http://code.toofishes.net/gitweb.cgi?p=pacman.git;a=shortlog;h=refs/heads/w… -Dan

5 14

[pacman-dev] [PATCH] Remove UseColor from front-end
by Nagy Gabor 27 Jul '08

27 Jul '08

From 0605fcacee9da726dabf9e86b68a3bb3d3a44904 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 26 Jul 2008 12:28:49 +0200 Subject: [PATCH] Remove UseColor from front-end This option wasn't used. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/conf.h | 1 - src/pacman/pacman.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 874ce70..9d2318d 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -63,7 +63,6 @@ typedef struct __config_t { /* conf file options */ unsigned short chomp; /* I Love Candy! */ - unsigned short usecolor; /* enable colorful output */ unsigned short showsize; /* show individual package sizes */ /* When downloading, display the amount downloaded, rate, ETA, and percent * downloaded of the total download list */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 813a728..445365e 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -643,9 +643,6 @@ static int _parseconfig(const char *file, const char *givensection, } else if(strcmp(key, "ILoveCandy") == 0) { config->chomp = 1; pm_printf(PM_LOG_DEBUG, "config: chomp\n"); - } else if(strcmp(key, "UseColor") == 0) { - config->usecolor = 1; - pm_printf(PM_LOG_DEBUG, "config: usecolor\n"); } else if(strcmp(key, "ShowSize") == 0) { config->showsize = 1; pm_printf(PM_LOG_DEBUG, "config: showsize\n"); -- 1.5.6.4

2 1

[pacman-dev] [Translation] Small fix to Italian translation
by Giovanni Scafora 27 Jul '08

27 Jul '08

Hi Dan, could you apply this patch before releasing new version 3.2.0 of pacman? Thanks a lot. -- Arch Linux Developer (voidnull) AUR & Pacman Italian Translations Microdia Developer http://www.archlinux.it

2 2

[pacman-dev] /etc/makepkg.local
by Mark Constable 26 Jul '08

26 Jul '08

Just a suggestion. If this was the last line in /etc/makepkg.conf then it would allow anyone to append functions that could be used inside a PKGBUILD. Potentionally good bang for buck for one extra line added to the official makepkg package. [ -f /etc/makepkg.local ] && source /etc/makepkg.local --markc

5 5

[pacman-dev] [PATCH] New fileconflict005.py pactest
by Nagy Gabor 25 Jul '08

25 Jul '08

From 13c0673aa16f71c58ec5665c5832bb44717d08d7 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 25 Jul 2008 14:35:54 +0200 Subject: [PATCH] New fileconflict005.py pactest This makes the fileconflict004.py test complete. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- pactest/tests/fileconflict005.py | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/fileconflict005.py diff --git a/pactest/tests/fileconflict005.py b/pactest/tests/fileconflict005.py new file mode 100644 index 0000000..b9c0fa9 --- /dev/null +++ b/pactest/tests/fileconflict005.py @@ -0,0 +1,23 @@ +self.description = "dir->symlink change during package upgrade (conflict)" + +p1 = pmpkg("pkg1", "1.0-1") +p1.files = ["test/", + "test/file1"] +self.addpkg2db("local", p1) + +p2 = pmpkg("pkg2") +p2.files = ["test/file2"] +self.addpkg2db("local", p2) + +p3 = pmpkg("pkg1", "2.0-1") +p3.files = ["test2/", + "test2/file3", + "test -> test2"] +self.addpkg2db("sync", p3) + +self.args = "-S pkg1" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_VERSION=pkg1|1.0-1") + -- 1.5.6.4

1 0

[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