- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/etc/pacman.d (mirrorlist.in)
by Dan McGee 05 Mar '07

05 Mar '07

Date: Sunday, March 4, 2007 @ 23:38:57 Author: dan Path: /home/cvs-pacman/pacman-lib/etc/pacman.d Modified: mirrorlist.in (1.3 -> 1.4) * Removed a mirrorlist that codemac says is quite outdated. ---------------+ mirrorlist.in | 1 - 1 file changed, 1 deletion(-) Index: pacman-lib/etc/pacman.d/mirrorlist.in diff -u pacman-lib/etc/pacman.d/mirrorlist.in:1.3 pacman-lib/etc/pacman.d/mirrorlist.in:1.4 --- pacman-lib/etc/pacman.d/mirrorlist.in:1.3 Wed Jan 31 23:12:58 2007 +++ pacman-lib/etc/pacman.d/mirrorlist.in Sun Mar 4 23:38:57 2007 @@ -8,7 +8,6 @@ Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/@@REPO@@/os… Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@ -Server = http://www2.cddc.vt.edu/linux/distributions/archlinux/@@REPO@@/os/@CARCH@ # Europe # - Austria

1 0

[pacman-dev] CVS update of pacman-lib/scripts (rankmirrors)
by Dan McGee 05 Mar '07

05 Mar '07

Date: Sunday, March 4, 2007 @ 21:32:14 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: rankmirrors (1.6 -> 1.7) * rankmirrors updates from Scott Horowitz <stonecrest(a)gmail.com>. Formatted output is now the default. Added a TODO for later as well. -------------+ rankmirrors | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) Index: pacman-lib/scripts/rankmirrors diff -u pacman-lib/scripts/rankmirrors:1.6 pacman-lib/scripts/rankmirrors:1.7 --- pacman-lib/scripts/rankmirrors:1.6 Thu Feb 22 03:06:54 2007 +++ pacman-lib/scripts/rankmirrors Sun Mar 4 21:32:14 2007 @@ -23,17 +23,20 @@ import os, sys, datetime, time, socket, urllib2 from optparse import OptionParser +# TODO: handle KeyboardInterrupt better, print list of already timed +# servers and then exit. Easier if program is function-ized. + def createOptParser(): usage = "usage: %prog [options] MIRRORFILE | URL" description = "Ranks pacman mirrors by their connection and opening " \ "speed. Pacman mirror files are located in /etc/pacman.d/. It " \ "can also rank one mirror if the URL is provided." parser = OptionParser(usage = usage, description = description) - parser.add_option("-f", "--formatted", action = "store_true", - dest = "formatted", default = False, - help = "output in mirror file format") parser.add_option("-n", type = "int", dest = "num", default = 0, help = "number of servers to output, 0 for all") + parser.add_option("-t", "--times", action = "store_true", + dest = "times", default = False, + help = "only output mirrors and their response times") parser.add_option("-u", "--url", action = "store_true", dest = "url", default=False, help="test a specific url") parser.add_option("-v", "--verbose", action = "store_true", @@ -88,43 +91,49 @@ fl = open(args[0], 'r') serverToTime = {} - if options.formatted: + if options.times: + print 'Querying servers, this may take some time...' + else: print "# Server list generated by rankmirrors on", print datetime.date.today() - else: - print 'Querying servers, this may take some time...' for ln in fl.readlines(): splitted = ln.split('=') if splitted[0].strip() != 'Server': - if options.formatted: + if not options.times: print ln, continue serverUrl = splitted[1].strip() if serverUrl[-1] == '\n': serverUrl = serverUrl[0:-1] - if options.verbose and options.formatted: - print '#',serverUrl,'...', - elif options.verbose: + if options.verbose and options.times: print serverUrl,'...', - elif not options.formatted: + elif options.verbose: + print '#',serverUrl,'...', + elif options.times: print ' * ', sys.stdout.flush() serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl)) if options.verbose: - print serverToTime[serverUrl] + try: + print "%.2f" % serverToTime[serverUrl] + except: + print serverToTime[serverUrl] items = serverToTime.items() items.sort(cmpPairBySecond) numToShow = int(options.num) if numToShow == 0: numToShow = len(items) if len(items) > 0: - if options.formatted: + if options.times: + print + print ' Servers sorted by time (seconds):' for i in items[0:numToShow]: - print 'Server =', i[0] + try: + print "%.2f" % i[1], ':', i[0] + except: + print i[1], ':', i[0] else: - print - print ' Servers sorted by time:' for i in items[0:numToShow]: - print i[1], ':', i[0] + print 'Server =', i[0] # vim: set ts=4 sw=4 et:

1 0

[pacman-dev] rankmirrors (default vs -f)
by Scott Horowitz 04 Mar '07

04 Mar '07

It seems that the default rankmirrors output without opts is to show times. rankmirrors -f is the much more common output that people would want imo, where you actually get a formatted /etc/pacman.d file. So I'd suggest one of two things: 1. Have rankmirrors without opts output formatted mirrors and add a rankmirrors -t to show times, or 2. Combine the two such that you get formatted output and (commented out) times. a. the times could be appended at the bottom b. times could be appended to each line (if pacman can handle this? i haven't checked). So, option 2a would be: Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/current/os/i686 Server = ftp://ftp.archlinux.org/current/os/i686 # Servers sorted by time: #1.59783601761 : http://www2.cddc.vt.edu/linux/distributions/archlinux/community/os/i686 #2.19922399521 : ftp://ftp.archlinux.org/community/os/i686 And 2b would be: Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/current/os/i686 # 1.59783601761 sec Server = ftp://ftp.archlinux.org/current/os/i686 # 2.19922399521 sec I personally like 2b best. And finally, I don't think we need to go to the hundred billionths decimal place for seconds ;-) Scott

1 1

[pacman-dev] more efficient use of db_cache needed
by Nagy Gabor 04 Mar '07

04 Mar '07

Hi! It's common practise that you load pkgcache with INFRQ_DEPENDS or similar which is slow, because you must read the whole db directory. Instead it would be more optimal, if you'd load db_cache with INFRQ_NONE almost always (in case of thransactions where only few packages are affected), because that is very fast (name and version are computed from the directory name, so you need to read only the root directory of the repo). And if you find the required package by name, you can read the required info. So first _alpm_db_scan with INFRQ_NONE then _alpm_db_read Bye, Nagy Gabor

3 6

[pacman-dev] CVS update of pacman-lib (12 files)
by Dan McGee 04 Mar '07

04 Mar '07

Date: Sunday, March 4, 2007 @ 12:16:52 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/po/de.po (1.11 -> 1.12) lib/libalpm/po/fr.po (1.6 -> 1.7) lib/libalpm/po/hu.po (1.6 -> 1.7) lib/libalpm/po/it.po (1.14 -> 1.15) lib/libalpm/po/libalpm.pot (1.7 -> 1.8) lib/libalpm/po/pt_BR.po (1.5 -> 1.6) src/pacman/po/de.po (1.12 -> 1.13) src/pacman/po/fr.po (1.6 -> 1.7) src/pacman/po/hu.po (1.6 -> 1.7) src/pacman/po/it.po (1.11 -> 1.12) src/pacman/po/pacman.pot (1.8 -> 1.9) src/pacman/po/pt_BR.po (1.7 -> 1.8) * Hopefully the LAST big update of the language files before release. Translators and developers should count this as the string freeze unless something REALLY essential comes up. Send in patches to these translations when you get a chance (and patches are appreciated, as they are much easier to deal with). ----------------------------+ lib/libalpm/po/de.po | 114 ++++++++++++++++++++++++------------------ lib/libalpm/po/fr.po | 110 ++++++++++++++++++++++++---------------- lib/libalpm/po/hu.po | 110 ++++++++++++++++++++++++---------------- lib/libalpm/po/it.po | 116 +++++++++++++++++++++++++------------------ lib/libalpm/po/libalpm.pot | 108 +++++++++++++++++++++++----------------- lib/libalpm/po/pt_BR.po | 108 +++++++++++++++++++++++----------------- src/pacman/po/de.po | 16 ++--- src/pacman/po/fr.po | 16 ++--- src/pacman/po/hu.po | 16 ++--- src/pacman/po/it.po | 16 ++--- src/pacman/po/pacman.pot | 16 ++--- src/pacman/po/pt_BR.po | 16 ++--- 12 files changed, 441 insertions(+), 321 deletions(-) The diff is longer than the limit of 39KB.

1 0

[pacman-dev] CVS update of pacman-lib (Makefile.am)
by Dan McGee 04 Mar '07

04 Mar '07

Date: Sunday, March 4, 2007 @ 12:14:37 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: Makefile.am (1.17 -> 1.18) * Update distcheck flags, we no longer need to pass --disable-fakeroot. All tests are passing except 1 known to fail (upgrade051). -------------+ Makefile.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) Index: pacman-lib/Makefile.am diff -u pacman-lib/Makefile.am:1.17 pacman-lib/Makefile.am:1.18 --- pacman-lib/Makefile.am:1.17 Thu Feb 22 23:54:49 2007 +++ pacman-lib/Makefile.am Sun Mar 4 12:14:37 2007 @@ -1,14 +1,12 @@ SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc pactest contrib -DISTCHECK_CONFIGURE_FLAGS = --disable-fakeroot +#DISTCHECK_CONFIGURE_FLAGS = --disable-fakeroot # Some files automatically included, so they aren't specified below: # AUTHORS, COPYING, NEWS, README EXTRA_DIST = HACKING -# TODO : figure out a way to get 'make distcheck' to build with -# --disable-fakeroot so it actually passes tests check-local: src/pacman - python $(top_srcdir)/pactest/pactest.py --test $(top_srcdir)/pactest/tests/*.py -p $(top_builddir)/src/pacman/pacman --debug=1 + python $(top_srcdir)/pactest/pactest.py --test $(top_srcdir)/pactest/tests/*.py -p $(top_builddir)/src/pacman/pacman rm -rf $(top_builddir)/root

1 0

[pacman-dev] 20070304 Italian libalpm patch
by Giovanni Scafora 04 Mar '07

04 Mar '07

Hi guys, there is a new patch with new messages. Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] CVS update of pacman-lib/pactest/tests (upgrade023.py)
by Aaron Griffin 04 Mar '07

04 Mar '07

Date: Sunday, March 4, 2007 @ 05:27:49 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest/tests Added: upgrade023.py (1.1) * By Roman's request - proactive backup=() entry test case ---------------+ upgrade023.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) Index: pacman-lib/pactest/tests/upgrade023.py diff -u /dev/null pacman-lib/pactest/tests/upgrade023.py:1.1 --- /dev/null Sun Mar 4 05:27:49 2007 +++ pacman-lib/pactest/tests/upgrade023.py Sun Mar 4 05:27:49 2007 @@ -0,0 +1,17 @@ +self.description = "Upgrade a package, with a backup file in the NEW package only" + +lp = pmpkg("dummy") +lp.files = ["etc/dummy.conf*"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy", "1.1-1") +p.files = ["etc/dummy.conf"] +p.backup = ["etc/dummy.conf"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PKG_VERSION=dummy|1.1-1") +self.addrule("!FILE_MODIFIED=etc/dummy.conf") +# Do we want this pacnew or not? +self.addrule("FILE_PACNEW=etc/dummy.conf")

1 0

[pacman-dev] no more NoUpgrade lines from pacman.conf!
by Roman Kyrylych 04 Mar '07

04 Mar '07

2007/3/4, Aaron Griffin <aaron(a)archlinux.org>: > Date: Sunday, March 4, 2007 @ 01:28:49 > * Removed NoUpgrade lines from pacman.conf - we need to test this! Finally! Besides that bug when file is overwritten first time after removing from NoUpgrade (which was fixed recently with proactive backup handling) I didn't see any issues. I don't use NoUpgrade since pacman 2.9.8. Can we (do we?) have some pactests for this? -- Roman Kyrylych (Роман Кирилич)

1 0

[pacman-dev] CVS update of pacman-lib (lib/libalpm/handle.c src/pacman/pacman.c)
by Aaron Griffin 04 Mar '07

04 Mar '07

Date: Sunday, March 4, 2007 @ 04:16:29 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/handle.c (1.35 -> 1.36) src/pacman/pacman.c (1.102 -> 1.103) * Fixed the handle realroot stuff * Added some {} ----------------------+ lib/libalpm/handle.c | 10 ++++++---- src/pacman/pacman.c | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) Index: pacman-lib/lib/libalpm/handle.c diff -u pacman-lib/lib/libalpm/handle.c:1.35 pacman-lib/lib/libalpm/handle.c:1.36 --- pacman-lib/lib/libalpm/handle.c:1.35 Sun Mar 4 04:08:55 2007 +++ pacman-lib/lib/libalpm/handle.c Sun Mar 4 04:16:28 2007 @@ -155,13 +155,13 @@ /* According to the man page, realpath is safe to use IFF the second arg is * NULL. */ char *realroot = realpath(root, NULL); - if(!realroot) { - realroot = root; + if(realroot) { + root = realroot; + } else { _alpm_log(PM_LOG_ERROR, _("cannot canonicalize specified root path '%s'"), root); } - /* check again, in case both are null */ - if(realroot) { + if(root) { /* verify root ends in a '/' */ int rootlen = strlen(realroot); if(realroot[rootlen-1] != '/') { @@ -172,6 +172,8 @@ handle->root[rootlen-1] = '/'; _alpm_log(PM_LOG_DEBUG, _("option 'root' = %s"), handle->root); + } + if(realroot) { free(realroot); } } Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.102 pacman-lib/src/pacman/pacman.c:1.103 --- pacman-lib/src/pacman/pacman.c:1.102 Mon Feb 26 03:43:02 2007 +++ pacman-lib/src/pacman/pacman.c Sun Mar 4 04:16:28 2007 @@ -434,8 +434,9 @@ } /* workaround for tr_TR */ - if(lang && !strcmp(lang, "tr_TR")) + if(lang && !strcmp(lang, "tr_TR")) { setlocale(LC_CTYPE, "C"); + } bindtextdomain("pacman", "/usr/share/locale"); textdomain("pacman");

1 0