- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/lib/libalpm (alpm.c)
by Dan McGee 05 Mar '07

05 Mar '07

Date: Monday, March 5, 2007 @ 14:21:33 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: alpm.c (1.123 -> 1.124) * Failure to #include config.h cost us here, we lost all NLS in alpm.c. --------+ alpm.c | 1 + 1 file changed, 1 insertion(+) Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.123 pacman-lib/lib/libalpm/alpm.c:1.124 --- pacman-lib/lib/libalpm/alpm.c:1.123 Sun Mar 4 04:08:54 2007 +++ pacman-lib/lib/libalpm/alpm.c Mon Mar 5 14:21:33 2007 @@ -37,6 +37,7 @@ #include <stdarg.h> #include <libintl.h> /* pacman */ +#include "config.h" #include "log.h" #include "error.h" #include "versioncmp.h"

1 0

[pacman-dev] CVS update of pacman-lib/pactest (6 files)
by Aaron Griffin 05 Mar '07

05 Mar '07

Date: Monday, March 5, 2007 @ 13:06:12 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest Modified: pactest.py (1.8 -> 1.9) pmdb.py (1.5 -> 1.6) pmpkg.py (1.4 -> 1.5) pmrule.py (1.5 -> 1.6) pmtest.py (1.5 -> 1.6) util.py (1.4 -> 1.5) * Fixed an issue with globbing the --test argument * Added a custom 'mkdir' function which makes parents and doesn't fail on existence * Added output for 'SKIP' messages (it did not indicate WHY it was skipped) * Added the ability to generate DB packages in the sync dir (not the cache dir) for testing downloading. (self.cachepkgs = False) * Added pmtest.path for the full path to the package file ------------+ pactest.py | 3 ++- pmdb.py | 5 ++--- pmpkg.py | 8 ++++++-- pmrule.py | 4 ++++ pmtest.py | 19 ++++++++++--------- util.py | 10 ++++++++++ 6 files changed, 34 insertions(+), 15 deletions(-) Index: pacman-lib/pactest/pactest.py diff -u pacman-lib/pactest/pactest.py:1.8 pacman-lib/pactest/pactest.py:1.9 --- pacman-lib/pactest/pactest.py:1.8 Fri Feb 23 00:12:58 2007 +++ pacman-lib/pactest/pactest.py Mon Mar 5 13:06:12 2007 @@ -36,7 +36,8 @@ globlist = [] # maintain the idx so we can modify rargs - while not parser.rargs[idx].startswith('-'): + while idx < len(parser.rargs) and \ + not parser.rargs[idx].startswith('-'): globlist += glob.glob(parser.rargs[idx]) idx += 1 Index: pacman-lib/pactest/pmdb.py diff -u pacman-lib/pactest/pmdb.py:1.5 pacman-lib/pactest/pmdb.py:1.6 --- pacman-lib/pactest/pmdb.py:1.5 Wed Feb 28 11:37:24 2007 +++ pacman-lib/pactest/pmdb.py Mon Mar 5 13:06:12 2007 @@ -219,8 +219,7 @@ """ path = os.path.join(self.dbdir, self.treename, pkg.fullname()) - if not os.path.isdir(path): - os.makedirs(path); + mkdir(path) # desc # for local db entries: name, version, desc, groups, url, license, @@ -332,7 +331,7 @@ mkdescfile(pkg.fullname(), pkg) # Generate database archive - os.makedirs(path, 0755) + mkdir(path) archive = os.path.join(path, "%s%s" % (self.treename, PM_EXT_DB)) os.system("tar zcf %s *" % archive) Index: pacman-lib/pactest/pmpkg.py diff -u pacman-lib/pactest/pmpkg.py:1.4 pacman-lib/pactest/pmpkg.py:1.5 --- pacman-lib/pactest/pmpkg.py:1.4 Tue Feb 27 11:25:01 2007 +++ pacman-lib/pactest/pmpkg.py Mon Mar 5 13:06:12 2007 @@ -33,6 +33,7 @@ """ def __init__(self, name, version = "1.0-1"): + self.path = "" #the path of the generated package # desc self.name = name self.version = version @@ -116,7 +117,7 @@ A package archive is generated in the location 'path', based on the data from the object. """ - archive = os.path.join(path, self.filename()) + self.path = os.path.join(path, self.filename()) curdir = os.getcwd() tmpdir = tempfile.mkdtemp() @@ -172,8 +173,11 @@ os.system("touch .FILELIST") targets += " .FILELIST" + #safely create the dir + mkdir(os.path.dirname(self.path)) + # Generate package archive - os.system("tar zcf %s %s" % (archive, targets)) + os.system("tar zcf %s %s" % (self.path, targets)) os.chdir(curdir) shutil.rmtree(tmpdir) Index: pacman-lib/pactest/pmrule.py diff -u pacman-lib/pactest/pmrule.py:1.5 pacman-lib/pactest/pmrule.py:1.6 --- pacman-lib/pactest/pmrule.py:1.5 Wed Feb 28 11:37:24 2007 +++ pacman-lib/pactest/pmrule.py Mon Mar 5 13:06:12 2007 @@ -57,6 +57,7 @@ if not grep(os.path.join(root, LOGFILE), key): success = 0 else: + print "PACMAN rule '%s' not found" % case success = -1 elif kind == "PKG": newpkg = localdb.db_read(key) @@ -100,6 +101,7 @@ if not found: success = 0 else: + print "PKG rule '%s' not found" % case success = -1 elif kind == "FILE": filename = os.path.join(root, key) @@ -122,8 +124,10 @@ if not os.path.isfile("%s%s" % (filename, PM_PACSAVE)): success = 0 else: + print "FILE rule '%s' not found" % case success = -1 else: + print "Rule kind '%s' not found" % kind success = -1 if self.false and success != -1: Index: pacman-lib/pactest/pmtest.py diff -u pacman-lib/pactest/pmtest.py:1.5 pacman-lib/pactest/pmtest.py:1.6 --- pacman-lib/pactest/pmtest.py:1.5 Mon Feb 26 03:19:03 2007 +++ pacman-lib/pactest/pmtest.py Mon Mar 5 13:06:12 2007 @@ -38,6 +38,7 @@ self.name = name self.testname = os.path.basename(name).replace('.py', '') self.root = root + self.cachepkgs = True def __str__(self): return "name = %s\n" \ @@ -130,14 +131,15 @@ vprint("\t%s" % os.path.join(TMPDIR, pkg.filename())) pkg.makepkg(tmpdir) for key, value in self.db.iteritems(): - if key == "local": - continue + if key == "local": continue for pkg in value.pkgs: - archive = pkg.filename() - vprint("\t%s" % os.path.join(PM_CACHEDIR, archive)) - pkg.makepkg(cachedir) - pkg.md5sum = getmd5sum(os.path.join(cachedir, archive)) - pkg.csize = os.stat(os.path.join(cachedir, archive))[stat.ST_SIZE] + vprint("\t%s" % os.path.join(PM_CACHEDIR, pkg.filename())) + if self.cachepkgs: + pkg.makepkg(cachedir) + else: + pkg.makepkg(os.path.join(syncdir, value.treename)) + pkg.md5sum = getmd5sum(pkg.path) + pkg.csize = os.stat(pkg.path)[stat.ST_SIZE] # Populating databases vprint(" Populating databases") @@ -151,8 +153,7 @@ # Creating sync database archives vprint(" Creating sync database archives") for key, value in self.db.iteritems(): - if key == "local": - continue + if key == "local": continue archive = value.treename + PM_EXT_DB vprint("\t" + os.path.join(SYNCREPO, archive)) value.gensync(os.path.join(syncdir, value.treename)) Index: pacman-lib/pactest/util.py diff -u pacman-lib/pactest/util.py:1.4 pacman-lib/pactest/util.py:1.5 --- pacman-lib/pactest/util.py:1.4 Wed Feb 28 11:37:24 2007 +++ pacman-lib/pactest/util.py Mon Mar 5 13:06:12 2007 @@ -247,6 +247,16 @@ fd.close() return found +def mkdir(dir): + if os.path.isdir(dir): + return + elif os.path.isfile(dir): + raise OSError("'%s' already exists and is not a directory" % dir) + else: + parent, thisdir = os.path.split(dir) + if parent: mkdir(parent) #recurse to make all parents + print "making dir %s" % thisdir + if thisdir: os.mkdir(dir) if __name__ == "__main__": pass

3 3

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

05 Mar '07

Date: Monday, March 5, 2007 @ 13:06:45 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest/tests Added: xfercommand001.py (1.1) Added this test to check the XferCommand functionality -------------------+ xfercommand001.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) Index: pacman-lib/pactest/tests/xfercommand001.py diff -u /dev/null pacman-lib/pactest/tests/xfercommand001.py:1.1 --- /dev/null Mon Mar 5 13:06:45 2007 +++ pacman-lib/pactest/tests/xfercommand001.py Mon Mar 5 13:06:45 2007 @@ -0,0 +1,20 @@ +self.description = "Quick check for using XferCommand" + +# this setting forces us to download packages +self.cachepkgs = False +#wget doesn't support file:// urls. curl does +self.option['xfercommand'] = ['/usr/bin/curl %u > %o'] + +numpkgs = 10 +pkgnames = [] +for i in xrange(numpkgs): + name = "pkg_%s" % i + pkgnames.append(name) + p = pmpkg(name) + p.files = ["usr/bin/foo-%s" % i] + self.addpkg2db("sync", p) + +self.args = "-S %s" % ' '.join(pkgnames) + +for name in pkgnames: + self.addrule("PKG_EXIST=%s" % name)

1 0

[pacman-dev] vercmp / force update
by Andreas Radke 05 Mar '07

05 Mar '07

we use "vercmp" to create our diffscript http://archlinux.org/~andyrtr/pkg_diff.html vercmp still reports 0.8.10a < 0.8.10 that's why we have to use force='y' in our PKGBUILDS that also appears in pkgdesc shouldn't we fix this before the release? i suggest to create a strict rule how to mark "alpha", "beta" and "rc" packages to get them detected as smaller values than the next/final and any other post-final "a" or "A" release. Andy

4 3

[pacman-dev] No .install messages standard yet?
by Alessio 'mOLOk' Bolognino 05 Mar '07

05 Mar '07

I think you should define a standard for the .install message to avoid the actual anarchy and proliferation of very different styles. Just my 2c, -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User http://www.archlinux.org

5 4

[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