- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] pacman.conf (manual) changes
by Nagy Gabor 28 Jul '08

28 Jul '08

From 6f83f47c8545674b7c8e1c3178ac40b2ace44f3a Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 26 Jul 2008 12:46:22 +0200 Subject: [PATCH] pacman.conf (manual) changes Document ILoveCandy, and set the default CleanMethod value. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.conf.5.txt | 3 +++ etc/pacman.conf.in | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 20a9067..0eee3f0 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -149,6 +149,9 @@ Options and completed percentage of the entire download list rather than the percent of each individual download target. The progress bar is still based solely on the current file download. + +*ILoveCandy*:: + Enables pacman game inspired progressbar. Repository Sections ------------------- diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 199626d..2101e3b 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -17,6 +17,7 @@ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = @@ -31,6 +32,7 @@ SyncFirst = pacman #ShowSize #UseDelta #TotalDownload +#ILoveCandy # # REPOSITORIES -- 1.5.6.4

4 7

[pacman-dev] Update for the README file
by Xavier 28 Jul '08

28 Jul '08

Dan complained several times that the README file was long outdated, so I tried to improve that. I hope I did not make it worse :/ As always, help/feedback is appreciated.

2 2

[pacman-dev] [PATCH] links problem in bacman
by Carlo Bersani 28 Jul '08

28 Jul '08

I just discovered test -e tries to resolve the link before testing, so if the link is copied before the actual file, the script exits. Here's the simple fix to this bug: --- bacman 2008-06-16 17:42:45.000000000 +0200 +++ bacman.new 2008-06-16 17:52:17.000000000 +0200 @@ -136,7 +136,7 @@ bsdtar -cnf - "/$i" 2> /dev/null | bsdtar -xpf - # Workaround to bsdtar not reporting a missing file as an error - if [ ! -e "$work_dir"/"$i" ]; then + if [ ! -e "$work_dir"/"$i" ] && [ ! -L "$work_dir"/"$i" ]; then echo "" echo "ERROR: unable to add /$i to the package" echo " If your user does not have permssion to read this file then"

5 14

[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