- Pacman-dev - lists.archlinux.org

[pacman-dev] Italian translation 2007-02-22
by Giovanni Scafora 22 Feb '07

22 Feb '07

Hi Dan, there is a new patch for italian translation with new messages and some corrections. 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/pactest.py scripts/rankmirrors)
by dan＠archlinux.org 22 Feb '07

22 Feb '07

Date: Thursday, February 22, 2007 @ 03:06:54 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: pactest/pactest.py (1.2 -> 1.3) scripts/rankmirrors (1.5 -> 1.6) * Rewrote pactest with an OptionParser so we can have helpful help text, and bumped the version to 0.4. Still a work in progress. * Changed some linewraps in rankmirrors to keep everything under 80 chars. ---------------------+ pactest/pactest.py | 97 +++++++++++++++++++++++++++++--------------------- scripts/rankmirrors | 24 +++++++----- 2 files changed, 72 insertions(+), 49 deletions(-) Index: pacman-lib/pactest/pactest.py diff -u pacman-lib/pactest/pactest.py:1.2 pacman-lib/pactest/pactest.py:1.3 --- pacman-lib/pactest/pactest.py:1.2 Wed Feb 21 01:33:13 2007 +++ pacman-lib/pactest/pactest.py Thu Feb 22 03:06:54 2007 @@ -1,5 +1,7 @@ #! /usr/bin/python # +# pactest : run automated testing on the pacman binary +# # Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> # # This program is free software; you can redistribute it and/or modify @@ -17,58 +19,75 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, # USA. - -import getopt -import sys -import glob -import os +import os, sys, glob +from optparse import OptionParser import pmenv import util - __author__ = "Aurelien FORET" -__version__ = "0.3" +__version__ = "0.4" +def resolveBinPath(option, opt_str, value, parser): + setattr(parser.values, option.dest, os.path.abspath(value)) -def usage(retcode): - """ - """ - print "Usage: %s [options] [[--test=<path/to/testfile.py>] ...]\n\n" % __file__ - sys.exit(retcode) +def globTests(option, opt_str, value, parser): + globlist = [] + globlist.extend(glob.glob(value)) + setattr(parser.values, option.dest, globlist) -if __name__ == "__main__": - env = pmenv.pmenv() +def createOptParser(): testcases = [] + usage = "usage: %prog [options] [[--test=<path/to/testfile.py>] ...]" + description = "Runs automated tests on the pacman binary. Tests are " \ + "described using an easy python syntax, and several can be " \ + "ran at once." + parser = OptionParser(usage = usage, description = description) + + parser.add_option("-v", "--verbose", action = "count", + dest = "verbose", default = 0, + help = "print verbose output") + parser.add_option("-d", "--debug", type = "int", + dest = "debug", default = 0, + help = "set debug level for pacman") + parser.add_option("-p", "--pacman", action = "callback", + callback = resolveBinPath, type = "string", + dest = "bin", default = "pacman", + help = "specify location of the pacman binary") + parser.add_option("-t", "--test", action = "callback", + callback = globTests, type = "string", + dest = "testcases", + help = "specify test case(s)") + parser.add_option("--nolog", action = "store_true", + dest = "nolog", default = False, + help = "do not log pacman messages") + parser.add_option("--gdb", action = "store_true", + dest = "gdb", default = False, + help = "use gdb while calling pacman") + parser.add_option("--valgrind", action = "store_true", + dest = "valgrind", default = False, + help = "use valgrind while calling pacman") + return parser - try: - opts, args = getopt.getopt(sys.argv[1:], - "d:hp:t:v", - ["debug=", "gdb", "help", "pacman=", "test=", "valgrind", "verbose", "nolog"]) - except getopt.GetoptError: - usage(1) - - for (cmd, param) in opts: - if cmd == "-v" or cmd == "--verbose": - util.verbose += 1 - elif cmd == "-d" or cmd == "--debug": - env.pacman["debug"] = int(param) - elif cmd == "-t" or cmd == "--test": - testcases.extend(glob.glob(param)) - elif cmd == "-p" or cmd == "--pacman": - env.pacman["bin"] = os.path.abspath(param) - elif cmd == "-h" or cmd == "--help": - usage(0) - elif cmd == "--nolog": - env.pacman["nolog"] = 1 - elif cmd == "--gdb": - env.pacman["gdb"] = 1 - elif cmd == "--valgrind": - env.pacman["valgrind"] = 1 + +if __name__ == "__main__": + # instantiate env and parser objects + env = pmenv.pmenv() + parser = createOptParser() + (opts, args) = parser.parse_args() - for i in testcases: + # add parsed options to env object + util.verbose = opts.verbose + env.pacman["debug"] = opts.debug + env.pacman["bin"] = opts.bin + env.pacman["nolog"] = opts.nolog + env.pacman["gdb"] = opts.gdb + env.pacman["valgrind"] = opts.valgrind + for i in opts.testcases: env.addtest(i) + # run tests and print overall results env.run() env.results() + # vim: set ts=4 sw=4 et: Index: pacman-lib/scripts/rankmirrors diff -u pacman-lib/scripts/rankmirrors:1.5 pacman-lib/scripts/rankmirrors:1.6 --- pacman-lib/scripts/rankmirrors:1.5 Sun Feb 11 20:08:35 2007 +++ pacman-lib/scripts/rankmirrors Thu Feb 22 03:06:54 2007 @@ -25,16 +25,19 @@ 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", dest="num", default=0, - help="number of servers to output, 0 for all") - parser.add_option("-u", "--url", action="store_true", dest="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("-u", "--url", action = "store_true", dest = "url", default=False, help="test a specific url") - parser.add_option("-v", "--verbose", action="store_true", dest="verbose", - default=False, help="be verbose in output") + parser.add_option("-v", "--verbose", action = "store_true", + dest = "verbose", default = False, help ="be verbose in output") return parser def timeCmd(cmd): @@ -86,7 +89,8 @@ fl = open(args[0], 'r') serverToTime = {} if options.formatted: - print "# Server list generated by rankmirrors on", datetime.date.today() + 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():

1 0

[pacman-dev] Updated German translation
by Pierre Schmitz 22 Feb '07

22 Feb '07

Hi, I updated the German translation due to the latest changes in pacman-cvs: http://svn.laber-land.de/pacman-de/trunk/lib/libalpm/po/de.po http://svn.laber-land.de/pacman-de/trunk/src/pacman/po/de.po Thanks, Pierre -- http://www.archlinux.de

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (cache.c conflict.c)
by Aaron Griffin 22 Feb '07

22 Feb '07

Date: Thursday, February 22, 2007 @ 01:36:05 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: cache.c (1.33 -> 1.34) conflict.c (1.41 -> 1.42) * debug cleanup (more) * Fixed conflict checking. I had mistakenly assumed that the transaction packages were of type 'pmsyncpkg_t', but that is not the case. Reverted back to pmpkg_t's and fixed some checking a bit. * pactest results: PASSED = 71 (100.00%) ------------+ cache.c | 4 ++-- conflict.c | 53 +++++++++++++++++++++++++++++------------------------ 2 files changed, 31 insertions(+), 26 deletions(-) Index: pacman-lib/lib/libalpm/cache.c diff -u pacman-lib/lib/libalpm/cache.c:1.33 pacman-lib/lib/libalpm/cache.c:1.34 --- pacman-lib/lib/libalpm/cache.c:1.33 Wed Feb 21 23:42:59 2007 +++ pacman-lib/lib/libalpm/cache.c Thu Feb 22 01:36:05 2007 @@ -106,7 +106,7 @@ _alpm_db_ensure_pkgcache(db, infolevel); if(!db->pkgcache) { - _alpm_log(PM_LOG_DEBUG, _("error: pkgcache is NULL for db %s"), db->treename); + _alpm_log(PM_LOG_DEBUG, _("error: pkgcache is NULL for db '%s'"), db->treename); } return(db->pkgcache); } @@ -197,7 +197,7 @@ alpm_list_t *pkgcache = _alpm_db_get_pkgcache(db, INFRQ_NONE); if(!pkgcache) { - _alpm_log(PM_LOG_DEBUG, _("error: pkgcache is NULL for db '%s'"), db->treename); + _alpm_log(PM_LOG_DEBUG, _("error: failed to get '%s' from NULL pkgcache"), target); return(NULL); } Index: pacman-lib/lib/libalpm/conflict.c diff -u pacman-lib/lib/libalpm/conflict.c:1.41 pacman-lib/lib/libalpm/conflict.c:1.42 --- pacman-lib/lib/libalpm/conflict.c:1.41 Wed Feb 21 23:42:59 2007 +++ pacman-lib/lib/libalpm/conflict.c Thu Feb 22 01:36:05 2007 @@ -329,17 +329,12 @@ } for(i = targets; i; i = i->next) { - pmsyncpkg_t *sync1, *sync2; pmpkg_t *p1, *p2, *dbpkg; char *filestr = NULL; char path[PATH_MAX+1]; struct stat buf; - sync1 = i->data; - if(!sync1) { - continue; - } - p1 = sync1->pkg; + p1 = i->data; if(!p1) { continue; } @@ -350,14 +345,19 @@ numtargs, (numtargs - alpm_list_count(i) +1)); /* CHECK 1: check every target against every target */ for(j = i->next; j; j = j->next) { - p2 = (pmpkg_t*)j->data; + p2 = j->data; + if(!p2) { + continue; + } _alpm_log(PM_LOG_DEBUG, "searching for file conflicts: %s and %s", p1->name, p2->name); tmpfiles = chk_fileconflicts(p1->files, p2->files); if(tmpfiles) { + char path[PATH_MAX]; for(k = tmpfiles; k; k = k->next) { + snprintf(path, PATH_MAX, "%s%s", root, (char *)k->data); conflicts = add_fileconflict(conflicts, PM_CONFLICT_TYPE_TARGET, - k->data, p1->name, p2->name); + path, p1->name, p2->name); } alpm_list_free_inner(tmpfiles, &free); alpm_list_free(tmpfiles); @@ -387,46 +387,51 @@ /* stat the file - if it exists and is not a dir, do some checks */ if(lstat(path, &buf) == 0 && !S_ISDIR(buf.st_mode)) { - _alpm_log(PM_LOG_DEBUG, "checking possible conflict: %s, %s", filestr, path); + _alpm_log(PM_LOG_DEBUG, "checking possible conflict: %s", path); /* Look at all the targets to see if file has changed hands */ + int resolved_conflict = 0; /* have we acted on this conflict? */ for(k = targets; k; k = k->next) { - sync2 = k->data; - if(!sync2) { - continue; - } - p2 = sync2->pkg; - if(!p2 || p2 == p1) { + p2 = k->data; + if(!p2 || strcmp(p1->name, p2->name) == 0) { continue; } - _alpm_log(PM_LOG_DEBUG, _("get pkg %s from %s"), p2->name, db->treename); pmpkg_t *localp2 = _alpm_db_get_pkgfromcache(db, p2->name); + /* Check if it used to exist in a package, but doesn't anymore */ - if(localp2 && !alpm_list_find_str(alpm_pkg_get_files(p2), filestr) - && alpm_list_find_str(alpm_pkg_get_files(localp2), filestr)) { + alpm_list_t *pkgfiles, *localfiles; /* added for readability */ + pkgfiles = alpm_pkg_get_files(p2); + localfiles = alpm_pkg_get_files(localp2); + + if(localp2 && !alpm_list_find_str(pkgfiles, filestr) + && alpm_list_find_str(localfiles, filestr)) { /* check if the file is now in the backup array */ if(alpm_list_find_str(alpm_pkg_get_backup(p1), filestr)) { /* keep file intact if it is in backup array */ trans->skip_add = alpm_list_add(trans->skip_add, strdup(path)); trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(path)); _alpm_log(PM_LOG_DEBUG, "file in backup array, adding to add and remove skiplist: %s", filestr); + resolved_conflict = 1; + break; } else { /* skip removal of file, but not add. this will prevent a second * package from removing the file when it was already installed * by its new owner */ trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(path)); _alpm_log(PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s", filestr); + resolved_conflict = 1; + break; } - } else { - _alpm_log(PM_LOG_DEBUG, "file found in conflict: %s", filestr); - conflicts = add_fileconflict(conflicts, PM_CONFLICT_TYPE_FILE, - filestr, p1->name, NULL); - break; } } + if(!resolved_conflict) { + _alpm_log(PM_LOG_DEBUG, "file found in conflict: %s", path); + conflicts = add_fileconflict(conflicts, PM_CONFLICT_TYPE_FILE, + path, p1->name, NULL); + } } else { - _alpm_log(PM_LOG_DEBUG, "%s is a directory, not a conflict", filestr); + _alpm_log(PM_LOG_DEBUG, "%s is a directory, not a conflict", path); } } alpm_list_free_inner(tmpfiles, &free);

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (trans.c)
by Aaron Griffin 22 Feb '07

22 Feb '07

Date: Wednesday, February 21, 2007 @ 23:46:34 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: trans.c (1.37 -> 1.38) * Forgot the second printf in the last commit ---------+ trans.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/trans.c diff -u pacman-lib/src/pacman/trans.c:1.37 pacman-lib/src/pacman/trans.c:1.38 --- pacman-lib/src/pacman/trans.c:1.37 Wed Feb 21 23:32:09 2007 +++ pacman-lib/src/pacman/trans.c Wed Feb 21 23:46:34 2007 @@ -352,7 +352,7 @@ opr, pkglen, pkgname); break; case PM_TRANS_PROGRESS_CONFLICTS_START: - printf("(%*d/%*d) %-*s", digits, remain, digits, howmany, + printf("(%2$*1$d/%3$*1$d) %5$-*4$s", digits, remain, howmany, textlen, opr); break; }

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (5 files)
by Aaron Griffin 22 Feb '07

22 Feb '07

Date: Wednesday, February 21, 2007 @ 23:42:59 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.118 -> 1.119) be_files.c (1.29 -> 1.30) cache.c (1.32 -> 1.33) conflict.c (1.40 -> 1.41) package.c (1.73 -> 1.74) * Cleaned up some debug output * Fixed a segfault in the conflict checking code * Added an automatic failure in the case of -A/-U for a replacement of an existing package. This requires a large amount of work and is postponed for now. Example: If ncmpc is installed, pacman -U /path/to/ncmpc-svn.pkg.tar.gz will fail with and appropriate error message ------------+ add.c | 16 ++++++++++++---- be_files.c | 1 - cache.c | 10 ++++++++-- conflict.c | 28 +++++++++++++++++++--------- package.c | 4 ++-- 5 files changed, 41 insertions(+), 18 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.118 pacman-lib/lib/libalpm/add.c:1.119 --- pacman-lib/lib/libalpm/add.c:1.118 Tue Feb 20 03:44:32 2007 +++ pacman-lib/lib/libalpm/add.c Wed Feb 21 23:42:59 2007 @@ -216,11 +216,11 @@ /* This is still messy. We have a lot of compare functions, and we should * try to consolidate them as much as we can (between add and sync) */ -static int pkg_cmp(const void *p1, const void *p2) +/*static int deppkg_cmp(const void *p1, const void *p2) { return(strcmp(((pmdepmissing_t *)p1)->target, ((pmdepmissing_t *)p2)->target)); -} +}*/ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) { @@ -255,14 +255,20 @@ _alpm_log(PM_LOG_DEBUG, _("looking for conflicts")); lp = _alpm_checkconflicts(db, trans->packages); for(i = lp; i; i = i->next) { - int skip_this = 0; pmdepmissing_t *miss = i->data; + _alpm_log(PM_LOG_ERROR, _("replacing packages with -A and -U is not supported yet")); + _alpm_log(PM_LOG_ERROR, _("please remove '%s' first, using -Rd"), miss->depend.name); + RET_ERR(PM_ERR_CONFLICTING_DEPS, -1); + /* Attempt to resolve conflicts */ + /* + int skip_this = 0; QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, miss->target, miss->depend.name, NULL, &skip_this); if(skip_this) { pmdepmissing_t *pkg = NULL; - lp = alpm_list_remove(lp, (void *)miss, pkg_cmp, (void*)&pkg); + lp = alpm_list_remove(lp, (void *)miss, deppkg_cmp, (void*)&pkg); + */ /* TODO: We remove the conflict from the list but never actually remove * the package. Need to do this to fix FS #3492. The sync code should * provide an example of how to do this, as it handles replaces and @@ -271,11 +277,13 @@ * still not remove the original package designated here for removal. * Better yet, dump all this shitty duplicate code and somehow combine * it with the sync code. */ + /* FREE(pkg); if(lp == NULL) { break; } } + */ } /* Removal code should go here, as described above. Instead of simply * removing items, perhaps throw them in another list to be removed, then Index: pacman-lib/lib/libalpm/be_files.c diff -u pacman-lib/lib/libalpm/be_files.c:1.29 pacman-lib/lib/libalpm/be_files.c:1.30 --- pacman-lib/lib/libalpm/be_files.c:1.29 Wed Feb 21 03:34:36 2007 +++ pacman-lib/lib/libalpm/be_files.c Wed Feb 21 23:42:59 2007 @@ -189,7 +189,6 @@ } } - _alpm_log(PM_LOG_DEBUG, _("db scan found package: %s"), pkg->name); return(pkg); } Index: pacman-lib/lib/libalpm/cache.c diff -u pacman-lib/lib/libalpm/cache.c:1.32 pacman-lib/lib/libalpm/cache.c:1.33 --- pacman-lib/lib/libalpm/cache.c:1.32 Wed Feb 21 03:34:36 2007 +++ pacman-lib/lib/libalpm/cache.c Wed Feb 21 23:42:59 2007 @@ -61,7 +61,7 @@ _alpm_db_rewind(db); while((info = _alpm_db_scan(db, NULL, infolevel)) != NULL) { - _alpm_log(PM_LOG_DEBUG, _("adding '%s' to package cache for db '%s'"), info->name, db->treename); + _alpm_log(PM_LOG_FUNCTION, _("adding '%s' to package cache for db '%s'"), info->name, db->treename); info->origin = PKG_FROM_CACHE; info->data = db; /* add to the collection */ @@ -195,7 +195,13 @@ return(NULL); } - return(_alpm_pkg_isin(target, _alpm_db_get_pkgcache(db, INFRQ_NONE))); + alpm_list_t *pkgcache = _alpm_db_get_pkgcache(db, INFRQ_NONE); + if(!pkgcache) { + _alpm_log(PM_LOG_DEBUG, _("error: pkgcache is NULL for db '%s'"), db->treename); + return(NULL); + } + + return(_alpm_pkg_isin(target, pkgcache)); } /* Returns a new group cache from db. Index: pacman-lib/lib/libalpm/conflict.c diff -u pacman-lib/lib/libalpm/conflict.c:1.40 pacman-lib/lib/libalpm/conflict.c:1.41 --- pacman-lib/lib/libalpm/conflict.c:1.40 Wed Feb 21 01:44:14 2007 +++ pacman-lib/lib/libalpm/conflict.c Wed Feb 21 23:42:59 2007 @@ -329,12 +329,21 @@ } for(i = targets; i; i = i->next) { + pmsyncpkg_t *sync1, *sync2; pmpkg_t *p1, *p2, *dbpkg; char *filestr = NULL; char path[PATH_MAX+1]; struct stat buf; - p1 = (pmpkg_t*)i->data; + sync1 = i->data; + if(!sync1) { + continue; + } + p1 = sync1->pkg; + if(!p1) { + continue; + } + percent = (double)(alpm_list_count(targets) - alpm_list_count(i) + 1) / alpm_list_count(targets); PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", (percent * 100), @@ -373,26 +382,25 @@ /* loop over each file to be installed */ for(j = tmpfiles; j; j = j->next) { filestr = j->data; - _alpm_log(PM_LOG_DEBUG, "checking possible conflict: %s", filestr); snprintf(path, PATH_MAX, "%s%s", root, filestr); /* stat the file - if it exists and is not a dir, do some checks */ if(lstat(path, &buf) == 0 && !S_ISDIR(buf.st_mode)) { + _alpm_log(PM_LOG_DEBUG, "checking possible conflict: %s, %s", filestr, path); /* Look at all the targets to see if file has changed hands */ for(k = targets; k; k = k->next) { - pmsyncpkg_t *sync = k->data; - if(!sync) { + sync2 = k->data; + if(!sync2) { continue; } - - p2 = sync->pkg; - - /* Ensure we aren't looking at current package */ - if(p2 == p1) { + p2 = sync2->pkg; + if(!p2 || p2 == p1) { continue; } + + _alpm_log(PM_LOG_DEBUG, _("get pkg %s from %s"), p2->name, db->treename); pmpkg_t *localp2 = _alpm_db_get_pkgfromcache(db, p2->name); /* Check if it used to exist in a package, but doesn't anymore */ if(localp2 && !alpm_list_find_str(alpm_pkg_get_files(p2), filestr) @@ -417,6 +425,8 @@ break; } } + } else { + _alpm_log(PM_LOG_DEBUG, "%s is a directory, not a conflict", filestr); } } alpm_list_free_inner(tmpfiles, &free); Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.73 pacman-lib/lib/libalpm/package.c:1.74 --- pacman-lib/lib/libalpm/package.c:1.73 Wed Feb 21 03:34:37 2007 +++ pacman-lib/lib/libalpm/package.c Wed Feb 21 23:42:59 2007 @@ -467,8 +467,8 @@ for(lp = haystack; lp; lp = lp->next) { pmpkg_t *info = lp->data; - if(info && !strcmp(info->name, needle)) { - return(lp->data); + if(info && strcmp(info->name, needle) == 0) { + return(info); } } return(NULL);

1 0

[pacman-dev] CVS update of pacman-lib (9 files)
by dan＠archlinux.org 22 Feb '07

22 Feb '07

Date: Wednesday, February 21, 2007 @ 23:36:03 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: Makefile.am (1.13 -> 1.14) TODO.dan (1.14 -> 1.15) configure.ac (1.32 -> 1.33) doc/Makefile.am (1.13 -> 1.14) lib/libalpm/Makefile.am (1.16 -> 1.17) scripts/Makefile.am (1.4 -> 1.5) src/pacman/Makefile.am (1.15 -> 1.16) src/pacman/log.h (1.6 -> 1.7) src/util/Makefile.am (1.8 -> 1.9) * A lot of Makefile.am updates to try to get 'make dist' and 'make distcheck' to work as expected. -------------------------+ Makefile.am | 8 +-- TODO.dan | 2 configure.ac | 118 +++++++++++++++++++++------------------------- doc/Makefile.am | 10 ++- lib/libalpm/Makefile.am | 61 ++++++++++++----------- scripts/Makefile.am | 24 +++++---- src/pacman/Makefile.am | 29 +++++++---- src/pacman/log.h | 2 src/util/Makefile.am | 2 9 files changed, 135 insertions(+), 121 deletions(-) Index: pacman-lib/Makefile.am diff -u pacman-lib/Makefile.am:1.13 pacman-lib/Makefile.am:1.14 --- pacman-lib/Makefile.am:1.13 Wed Feb 21 02:12:34 2007 +++ pacman-lib/Makefile.am Wed Feb 21 23:36:02 2007 @@ -1,9 +1,9 @@ SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc -EXTRA_DIST = \ - NEWS \ - COPYING \ - README +# Some files automatically included, so they aren't specified below: +# AUTHORS, COPYING, NEWS, README +# TODO: move translation-help to ABOUT-NLS? +EXTRA_DIST = HACKING check: src/pacman cd pactest; python pactest.py --test=tests/*.py -p ../src/pacman/pacman --debug=1 Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.14 pacman-lib/TODO.dan:1.15 --- pacman-lib/TODO.dan:1.14 Wed Feb 21 03:34:36 2007 +++ pacman-lib/TODO.dan Wed Feb 21 23:36:02 2007 @@ -86,6 +86,8 @@ Rewrite makepkg to use terminal-safe coloring/bolding. tput utility should allow us to do this. +Bugs/FRs to smash: 6468, 6437, 6430?, 6420, 6404, 6389, 6312?, 6284, 6273?, 6255?, 6208, 5987, 5885, 5571, 4182, 3492, 2810?, 1769, 1588, 1571 + Other smaller things: --------------------- Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.32 pacman-lib/configure.ac:1.33 --- pacman-lib/configure.ac:1.32 Mon Feb 12 20:25:26 2007 +++ pacman-lib/configure.ac Wed Feb 21 23:36:02 2007 @@ -11,16 +11,9 @@ AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION(0.13.1) -dnl Host dependant flags -case "${host}" in - *-*-cygwin*) - ENV_CFLAGS="$ENV_CFLAGS -DCYGWIN" - ;; -esac - dnl Define here the libalpm version number -PM_MAJOR_VERSION=0 -PM_MINOR_VERSION=1 +PM_MAJOR_VERSION=1 +PM_MINOR_VERSION=0 PM_MICRO_VERSION=0 PM_VERSION=$PM_MAJOR_VERSION.$PM_MINOR_VERSION.$PM_MICRO_VERSION dnl Needed for libtool to create proper shared lib version @@ -59,112 +52,109 @@ AC_HELP_STRING([--disable-doxygen], [Build API docs via Doxygen]), [wantdoxygen=$enableval], [wantdoxygen=yes]) +dnl Help line for config file +AC_ARG_WITH(config-file, + AC_HELP_STRING([ --with-config-file=path], [Set the location of pacman's config file]), + [configfile=$withval], [configfile=/etc/pacman.conf]) + +dnl Help line for debug +AC_ARG_ENABLE(debug, + AC_HELP_STRING([--enable-debug], [Enable debugging support]), + [debug=$enableval], [debug=no]) + +dnl Help line for fakeroot +AC_ARG_ENABLE(fakeroot, + AC_HELP_STRING([--disable-fakeroot], [Disable fakeroot proof support]), + [fakeroot=$enableval], [fakeroot=yes]) + +dnl Host dependant flags +case "${host}" in + *-*-cygwin*) + ENV_CFLAGS="$ENV_CFLAGS -DCYGWIN" + ;; +esac + dnl Check for architecture -case "$host" in - i686-*) AC_DEFINE_UNQUOTED([CARCH], ["i686"], [Architecture]) - AC_DEFINE_UNQUOTED([CARCHFLAGS], ["i686"], [Architecture]) - AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) +case "${host}" in + i686-*) CARCH="i686" CARCHFLAGS="i686" ARCHSWITCH="march" - CHOST="${host}" ;; - x86_64-*) AC_DEFINE_UNQUOTED([CARCH], ["x86_64"], [Architecture]) - AC_DEFINE_UNQUOTED([CARCHFLAGS], ["x86-64"], [Architecture]) - AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) + x86_64-*) CARCH="x86_64" CARCHFLAGS="x86-64" ARCHSWITCH="march" - CHOST="${host}" ;; - ia64-*) AC_DEFINE_UNQUOTED([CARCH], ["ia64"], [Architecture]) - AC_DEFINE_UNQUOTED([CARCHFLAGS], ["ia64"], [Architecture]) - AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) + ia64-*) CARCH="ia64" CARCHFLAGS="ia64" ARCHSWITCH="march" - CHOST="${host}" ;; - sparc-*) AC_DEFINE_UNQUOTED([CARCH], ["sparc"], [Architecture]) - AC_DEFINE_UNQUOTED([CARCHFLAGS], ["v9"], [Architecture]) - AC_DEFINE_UNQUOTED([ARCHSWITCH], ["mcpu"], [Architecture]) + sparc-*) CARCH="sparc" CARCHFLAGS="v9" ARCHSWITCH="mcpu" - CHOST="${host}" ;; ppc-* | powerpc-*) - AC_DEFINE_UNQUOTED([CARCH], ["ppc"], [Architecture]) - AC_DEFINE_UNQUOTED([CARCHFLAGS], ["750"], [Architecture]) - AC_DEFINE_UNQUOTED([ARCHSWITCH], ["mcpu"], [Architecture]) CARCH="ppc" CARCHFLAGS="750" ARCHSWITCH="mcpu" - CHOST="${host}" ;; - i386-*) AC_DEFINE_UNQUOTED([CARCH], ["i386"], [Architecture]) - AC_DEFINE_UNQUOTED([CARCHFLAGS], ["i386"], [Architecture]) - AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture]) + i386-*) CARCH="i386" CARCHFLAGS="i386" ARCHSWITCH="march" - CHOST="${host}" ;; *) AC_MSG_ERROR([Your architecture is not supported]) ;; esac +dnl Now do some things common to all architectures +CHOST="${host}" +AC_DEFINE_UNQUOTED([CARCH], ["$CARCH"], [Architecture]) +AC_DEFINE_UNQUOTED([CARCHFLAGS], ["$CARCHFLAGS"], [Architecture Flags]) +AC_DEFINE_UNQUOTED([ARCHSWITCH], ["$ARCHSWITCH"], [Architecture Switch (march/mcpu)]) +AC_DEFINE_UNQUOTED([CHOST], ["$CHOST"], [Host Type]) AC_SUBST(CARCH) AC_SUBST(CARCHFLAGS) AC_SUBST(ARCHSWITCH) AC_SUBST(CHOST) -dnl Help line for config file -AC_ARG_WITH(config-file, - AC_HELP_STRING([ --with-config-file=path], [Set the name and path for pacman's config file]), - [configfile=$withval], [configfile=/etc/pacman.conf]) - -dnl Help line for debug -AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug], [Enable debugging support]), - [debug=$enableval], [debug=no]) - -dnl Help line for fakeroot -AC_ARG_ENABLE(fakeroot, - AC_HELP_STRING([--disable-fakeroot], [Disable fakeroot proof support]), - [fakeroot=$enableval], [fakeroot=yes]) - dnl Check for man2html binary -AC_MSG_CHECKING(for support man2html) -if test x$wantman2html = xyes ; then +AC_MSG_CHECKING(for man2html) +if test "x$wantman2html" = "xyes" ; then AC_CHECK_PROGS([MAN2HTML], [man2html]) AM_CONDITIONAL(HAS_MAN2HTML, test $MAN2HTML) if test $MAN2HTML ; then - AC_DEFINE([HAS_MAN2HTML], [TRUE], [Enabled HTML generation from man via man2html]) - AC_MSG_RESULT(yes) + AC_DEFINE([HAS_MAN2HTML], [TRUE], [Enable HTML manpages using man2html]) + AC_MSG_RESULT(yes) else - AC_DEFINE([HAS_MAN2HTML], [FALSE], [Disabled HTML generation from man via man2html]) - AC_MSG_RESULT(no, man2html missing) + AC_MSG_RESULT(no, man2html missing) fi else - AM_CONDITIONAL(HAS_MAN2HTML, test $MAN2HTML) - AC_DEFINE([HAS_MAN2HTML], [FALSE], [Not specified at configure line]) - AC_MSG_RESULT(not requested by configure) + AM_CONDITIONAL(HAS_MAN2HTML, false) + AC_MSG_RESULT(no, disabled by configure) fi dnl Check for doxygen support -if test x$wantdoxygen = xyes ; then +AC_MSG_CHECKING(for doxygen) +if test "x$wantdoxygen" = "xyes" ; then AC_CHECK_PROGS([DOXYGEN], [doxygen]) + AM_CONDITIONAL(HAS_DOXYGEN, test $DOXYGEN) if test $DOXYGEN ; then - DOXYSTATUS="yes, path: `which $DOXYGEN`" + DOXYSTATUS="yes, path: `which $DOXYGEN`" + AC_MSG_RESULT(yes) else - DOXYSTATUS="doxygen binary not found" + DOXYSTATUS="doxygen binary not found" + AC_MSG_RESULT(no, doxygen missing) fi else + AM_CONDITIONAL(HAS_DOXYGEN, false) DOXYSTATUS="no, disabled by configure" + AC_MSG_RESULT(no, disabled by configure) fi -AM_CONDITIONAL(HAS_DOXYGEN, test $DOXYGEN) dnl Check for math AC_CHECK_LIB([m], [sqrt], [AC_CHECK_HEADER([math.h], [LIBM='-lm'])]) @@ -196,12 +186,12 @@ dnl Enable or disable debug code AC_MSG_CHECKING(for debug mode request) if test "$debug" = "yes" ; then - AM_CONDITIONAL(PACMAN_DEBUG, test "$debug" = "yes") + AM_CONDITIONAL(PACMAN_DEBUG, test "x$debug" = "xyes") CFLAGS="$CFLAGS -g -Wall -Werror -std=c99 -DPACMAN_DEBUG" LDFLAGS="$LDFLAGS -lmcheck" AC_MSG_RESULT(yes) else - AM_CONDITIONAL(PACMAN_DEBUG, test "$debug" = "no") + AM_CONDITIONAL(PACMAN_DEBUG, test "x$debug" = "xno") CFLAGS="$CFLAGS -Wall -std=c99" AC_MSG_RESULT(no) fi Index: pacman-lib/doc/Makefile.am diff -u pacman-lib/doc/Makefile.am:1.13 pacman-lib/doc/Makefile.am:1.14 --- pacman-lib/doc/Makefile.am:1.13 Fri Feb 9 13:37:27 2007 +++ pacman-lib/doc/Makefile.am Wed Feb 21 23:36:02 2007 @@ -21,10 +21,14 @@ clean: rm -f html/*.html rm -f man3/*.3 - rm -f man5/*.5 - rm -f man8/*.8 -man_MANS = pacman.8 makepkg.8 PKGBUILD.5 makepkg.conf.5 pacman.conf.5 libalpm.3 +man_MANS = \ + pacman.8 \ + makepkg.8 \ + PKGBUILD.5 \ + makepkg.conf.5 \ + pacman.conf.5 \ + libalpm.3 if HAS_DOXYGEN man_MANS += *.3 Index: pacman-lib/lib/libalpm/Makefile.am diff -u pacman-lib/lib/libalpm/Makefile.am:1.16 pacman-lib/lib/libalpm/Makefile.am:1.17 --- pacman-lib/lib/libalpm/Makefile.am:1.16 Tue Jan 30 00:41:13 2007 +++ pacman-lib/lib/libalpm/Makefile.am Wed Feb 21 23:36:02 2007 @@ -1,41 +1,42 @@ AUTOMAKE_OPTIONS = gnu -DEFINES = -pedantic -D_GNU_SOURCE -AM_CFLAGS = $(DEFINES) + SUBDIRS = po +lib_LTLIBRARIES = libalpm.la +include_HEADERS = alpm_list.h alpm.h + localedir = $(datadir)/locale DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ -TARGETS = md5driver.c \ - md5.c \ - sha1.c \ - util.c \ - alpm_list.c \ - log.c \ - error.c \ - package.c \ - group.c \ - db.c \ - cache.c \ - conflict.c \ - deps.c \ - provide.c \ - versioncmp.c \ - backup.c \ - trans.c \ - add.c \ - remove.c \ - sync.c \ - handle.c \ - server.c \ - alpm.c \ - be_files.c +AM_CFLAGS = -pedantic -D_GNU_SOURCE $(CFLAGS) -lib_LTLIBRARIES = libalpm.la - -include_HEADERS = alpm_list.h alpm.h +EXTRA_DIST = Doxyfile -libalpm_la_SOURCES = $(TARGETS) +libalpm_la_SOURCES = \ + add.h add.c \ + alpm.h alpm.c \ + alpm_list.h alpm_list.c \ + backup.h backup.c \ + be_files.c \ + cache.h cache.c \ + conflict.h conflict.c \ + db.h db.c \ + deps.h deps.c \ + error.h error.c \ + group.h group.c \ + handle.h handle.c \ + log.h log.c \ + md5.h md5.c \ + md5driver.c \ + package.h package.c \ + provide.h provide.c \ + remove.h remove.c \ + server.h server.c \ + sha1.h sha1.c \ + sync.h sync.c \ + trans.h trans.c \ + util.h util.c \ + versioncmp.h versioncmp.c libalpm_la_LDFLAGS = -no-undefined -version-info $(PM_VERSION_INFO) libalpm_la_LIBADD = -larchive -ldownload -lm Index: pacman-lib/scripts/Makefile.am diff -u pacman-lib/scripts/Makefile.am:1.4 pacman-lib/scripts/Makefile.am:1.5 --- pacman-lib/scripts/Makefile.am:1.4 Sun Feb 11 16:03:00 2007 +++ pacman-lib/scripts/Makefile.am Wed Feb 21 23:36:03 2007 @@ -1,11 +1,15 @@ AUTOMAKE_OPTIONS = std-options -bin_SCRIPTS = gensync \ - makepkg \ - makeworld \ - updatesync \ - pacman-optimize \ - rankmirrors \ - abs \ - repo-add \ - repo-remove \ - re-pacman + +bin_SCRIPTS = \ + abs \ + gensync \ + makepkg \ + makeworld \ + pacman-optimize \ + rankmirrors \ + repo-add \ + repo-remove \ + re-pacman \ + updatesync + +abs gensync makepkg makeworld pacman-optimize rankmirrors repo-add repo-remove re-pacman updatesync: Index: pacman-lib/src/pacman/Makefile.am diff -u pacman-lib/src/pacman/Makefile.am:1.15 pacman-lib/src/pacman/Makefile.am:1.16 --- pacman-lib/src/pacman/Makefile.am:1.15 Wed Feb 21 01:35:07 2007 +++ pacman-lib/src/pacman/Makefile.am Wed Feb 21 23:36:03 2007 @@ -1,25 +1,36 @@ +SUBDIRS = po + bin_PROGRAMS = pacman if LINKSTATIC bin_PROGRAMS += pacman.static endif -SUBDIRS = po - localedir = $(datadir)/locale DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ +INCLUDES = -I$(top_srcdir)/lib/libalpm -AM_CFLAGS = -D_GNU_SOURCE -I$(top_srcdir)/lib/libalpm $(CFLAGS) - -pacman_SOURCES = util.c log.c package.c downloadprog.c trans.c add.c \ - remove.c upgrade.c query.c sync.c conf.c deptest.c pacman.c +AM_CFLAGS = -D_GNU_SOURCE $(CFLAGS) -pacman_static_SOURCES = $(pacman_SOURCES) +pacman_SOURCES = \ + add.h add.c \ + conf.h conf.c \ + deptest.h deptest.c \ + downloadprog.h downloadprog.c \ + log.h log.c \ + package.h package.c \ + pacman.c \ + query.h query.c \ + remove.h remove.c \ + sync.h sync.c \ + trans.h trans.c \ + upgrade.h upgrade.c \ + util.h util.c pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \ -ldownload +pacman_static_SOURCES = $(pacman_SOURCES) +pacman_static_LDFLAGS = $(LDFLAGS) -all-static pacman_static_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \ -ldownload - -pacman_static_LDFLAGS = $(LDFLAGS) -all-static Index: pacman-lib/src/pacman/log.h diff -u pacman-lib/src/pacman/log.h:1.6 pacman-lib/src/pacman/log.h:1.7 --- pacman-lib/src/pacman/log.h:1.6 Fri Dec 22 02:11:20 2006 +++ pacman-lib/src/pacman/log.h Wed Feb 21 23:36:03 2007 @@ -21,6 +21,8 @@ #ifndef _PM_LOG_H #define _PM_LOG_H +/* TODO these are illegal in ISO C, thus the reason -pedantic was never used + * as a compile flag for the pacman side of things (named variadic macros) */ #define MSG(line, fmt, args...) pm_fprintf(stdout, line, fmt, ##args) #define ERR(line, fmt, args...) do { \ pm_fprintf(stderr, line, _("error: ")); \ Index: pacman-lib/src/util/Makefile.am diff -u pacman-lib/src/util/Makefile.am:1.8 pacman-lib/src/util/Makefile.am:1.9 --- pacman-lib/src/util/Makefile.am:1.8 Sun Feb 11 20:30:02 2007 +++ pacman-lib/src/util/Makefile.am Wed Feb 21 23:36:03 2007 @@ -1,6 +1,6 @@ bin_PROGRAMS = vercmp testpkg -AM_CFLAGS = -I$(top_srcdir)/lib/libalpm +INCLUDES = -I$(top_srcdir)/lib/libalpm vercmp_SOURCES = vercmp.c vercmp_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.so

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (trans.c)
by Aaron Griffin 22 Feb '07

22 Feb '07

Date: Wednesday, February 21, 2007 @ 23:32:10 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: trans.c (1.36 -> 1.37) * Using positional params (POSIX compliant, not C standard) for printfs that require a lot of duplicates - this may or may not be a good idea with regards to portability, but we'll see ---------+ trans.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/src/pacman/trans.c diff -u pacman-lib/src/pacman/trans.c:1.36 pacman-lib/src/pacman/trans.c:1.37 --- pacman-lib/src/pacman/trans.c:1.36 Sat Feb 17 03:55:06 2007 +++ pacman-lib/src/pacman/trans.c Wed Feb 21 23:32:09 2007 @@ -348,8 +348,8 @@ /* TODO clean up so digits and pkglen aren't passed twice */ /* TODO we may need some sort of wchar_t wprintf output here in order * to get the lengths right, prinf works on bytes and not chars */ - printf("(%*d/%*d) %s %-*.*s", digits, remain, digits, howmany, - opr, pkglen, pkglen, pkgname); + printf("(%2$*1$d/%3$*1$d) %4$s %6$-*5$.*5$s", digits, remain, howmany, + opr, pkglen, pkgname); break; case PM_TRANS_PROGRESS_CONFLICTS_START: printf("(%*d/%*d) %-*s", digits, remain, digits, howmany,

1 0

[pacman-dev] New messages for Italian translation
by Giovanni Scafora 22 Feb '07

22 Feb '07

Hi guys, there are two patches for new messages in italian translation. Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

2 4

[pacman-dev] CVS update of pacman-lib (lib/libalpm/po/it.po src/pacman/po/it.po)
by dan＠archlinux.org 21 Feb '07

21 Feb '07

Date: Wednesday, February 21, 2007 @ 14:27:39 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/po/it.po (1.6 -> 1.7) src/pacman/po/it.po (1.7 -> 1.8) * Updated Italian translation Giovanni Scafora <linuxmania(a)gmail.com> ----------------------+ lib/libalpm/po/it.po | 225 ++++++++++++++++++++++++++++++------------------- src/pacman/po/it.po | 132 ++++++++++++++-------------- 2 files changed, 204 insertions(+), 153 deletions(-) Index: pacman-lib/lib/libalpm/po/it.po diff -u pacman-lib/lib/libalpm/po/it.po:1.6 pacman-lib/lib/libalpm/po/it.po:1.7 --- pacman-lib/lib/libalpm/po/it.po:1.6 Tue Feb 20 14:33:13 2007 +++ pacman-lib/lib/libalpm/po/it.po Wed Feb 21 14:27:39 2007 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: libalpm VERSION\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-02-20 20:15+0100\n" -"PO-Revision-Date: 2007-02-20 20:30+0100\n" +"POT-Creation-Date: 2007-02-21 19:50+0100\n" +"PO-Revision-Date: 2007-02-21 20:30+0100\n" "Last-Translator: Giovanni Scafora <linuxmania(a)gmail.com>\n" "Language-Team: Arch Linux Italian Team <linuxmania(a)gmail.com>\n" "MIME-Version: 1.0\n" @@ -46,7 +46,7 @@ msgid "looking for unsatisfied dependencies" msgstr "ricerca delle dipendenze non soddisfatte" -#: lib/libalpm/add.c:255 lib/libalpm/sync.c:473 +#: lib/libalpm/add.c:255 lib/libalpm/sync.c:476 msgid "looking for conflicts" msgstr "ricerca dei conflitti in corso" @@ -243,7 +243,7 @@ msgid "installing" msgstr "installazione in corso" -#: lib/libalpm/add.c:804 lib/libalpm/remove.c:317 +#: lib/libalpm/add.c:804 lib/libalpm/remove.c:321 msgid "updating database" msgstr "aggiornamento del database in corso" @@ -262,7 +262,7 @@ msgid "could not add entry '%s' in cache" msgstr "impossible includere la voce '%s' nella cache" -#: lib/libalpm/add.c:844 lib/libalpm/remove.c:337 lib/libalpm/sync.c:1043 +#: lib/libalpm/add.c:844 lib/libalpm/remove.c:341 lib/libalpm/sync.c:1046 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "esecuzione in corso di \"ldconfig -r %s\"" @@ -431,7 +431,7 @@ msgid "config: upgradedelay: %d" msgstr "config: upgradedelay: %d" -#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197 +#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129 msgid "checking for package replacements" msgstr "controllo delle sostituzioni dei pacchetti in corso" @@ -452,17 +452,17 @@ msgstr "" "%s-%s selezionato per l'aggiornamento (per essere sostituito con %s-%s)" -#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:211 +#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:210 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "'%s' non trovato nel database -- ignorato" -#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:225 lib/libalpm/sync.c:499 +#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:224 lib/libalpm/sync.c:502 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "'%s' è già selezionato per la rimozione -- ignorato" -#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:232 +#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:235 #, c-format msgid "%s-%s elected for upgrade (%s => %s)" msgstr "%s-%s selezionato per l'aggiornamento (%s => %s)" @@ -472,17 +472,32 @@ msgid "unpacking database '%s'" msgstr "estrazione del database '%s' in corso" -#: lib/libalpm/be_files.c:182 +#: lib/libalpm/be_files.c:75 +#, c-format +msgid "opening database from path '%s'" +msgstr "apertura in corso del database dal path '%s'" + +#: lib/libalpm/be_files.c:179 +#, c-format +msgid "db scan could not find package: %s" +msgstr "impossibile trovare il pacchetto: %s" + +#: lib/libalpm/be_files.c:183 #, c-format msgid "invalid name for dabatase entry '%s'" msgstr "nome non valido per la voce del database '%s'" -#: lib/libalpm/be_files.c:212 +#: lib/libalpm/be_files.c:192 +#, c-format +msgid "db scan found package: %s" +msgstr "trovato il pacchetto: %s" + +#: lib/libalpm/be_files.c:214 msgid "invalid package entry provided to _alpm_db_read, skipping" msgstr "" "nome non valido per il pacchetto fornito a _alpm_db_read, verrà ignorato" -#: lib/libalpm/be_files.c:217 +#: lib/libalpm/be_files.c:219 #, c-format msgid "" "request to read database info for a file-based package '%s', skipping..." @@ -490,35 +505,35 @@ "richiesta di lettura del database per un pacchetto file-based '%s', verrà " "ignorato..." -#: lib/libalpm/be_files.c:225 +#: lib/libalpm/be_files.c:227 #, c-format msgid "loading package data for %s : level=%d" msgstr "caricamento in corso dei dati del pacchetto %s : livello=%d" -#: lib/libalpm/be_files.c:233 +#: lib/libalpm/be_files.c:235 #, c-format msgid "cannot find '%s-%s' in db '%s'" msgstr "impossibile trovare '%s-%s' nel database '%s'" -#: lib/libalpm/be_files.c:241 lib/libalpm/be_files.c:391 -#: lib/libalpm/be_files.c:414 lib/libalpm/be_files.c:502 -#: lib/libalpm/be_files.c:591 lib/libalpm/be_files.c:618 +#: lib/libalpm/be_files.c:243 lib/libalpm/be_files.c:393 +#: lib/libalpm/be_files.c:416 lib/libalpm/be_files.c:504 +#: lib/libalpm/be_files.c:593 lib/libalpm/be_files.c:620 #: lib/libalpm/package.c:197 #, c-format msgid "could not open file %s: %s" msgstr "impossibile aprire il file %s: %s" -#: lib/libalpm/be_files.c:499 +#: lib/libalpm/be_files.c:501 #, c-format msgid "writing %s-%s DESC information back to db" msgstr "scrittura in corso di %s-%s" -#: lib/libalpm/be_files.c:588 +#: lib/libalpm/be_files.c:590 #, c-format msgid "writing %s-%s FILES information back to db" msgstr "scrittura in corso di %s-%s" -#: lib/libalpm/be_files.c:615 +#: lib/libalpm/be_files.c:617 #, c-format msgid "writing %s-%s DEPENDS information back to db" msgstr "scrittura in corso di %s-%s" @@ -529,29 +544,39 @@ msgstr "" "caricamento della cache del pacchetto (infolevel=%#x) per il repository '%s'" -#: lib/libalpm/cache.c:83 +#: lib/libalpm/cache.c:64 +#, c-format +msgid "adding '%s' to package cache for db '%s'" +msgstr "aggiunta di '%s' alla cache del pacchetto per il database '%s'" + +#: lib/libalpm/cache.c:84 #, c-format msgid "freeing package cache for repository '%s'" msgstr "pulizia in corso della cache dei pacchetti per il repository '%s'" -#: lib/libalpm/cache.c:132 +#: lib/libalpm/cache.c:109 +#, c-format +msgid "error: pkgcache is NULL for db %s" +msgstr "errore: pkgcache è NULL per il database %s" + +#: lib/libalpm/cache.c:136 #, c-format msgid "package cache reloaded (infolevel=%#x) for repository '%s'" msgstr "" "ricaricamento della cache del pacchetto (infolevel=%#x) per il repository '%" "s'" -#: lib/libalpm/cache.c:152 +#: lib/libalpm/cache.c:156 #, c-format msgid "adding entry '%s' in '%s' cache" msgstr "inclusione della voce '%s' nella cache di '%s'" -#: lib/libalpm/cache.c:178 +#: lib/libalpm/cache.c:182 #, c-format msgid "removing entry '%s' from '%s' cache" msgstr "rimozione della voce '%s' dalla cache di '%s'" -#: lib/libalpm/cache.c:213 +#: lib/libalpm/cache.c:217 #, c-format msgid "loading group cache for repository '%s'" msgstr "caricamento della cache del gruppo per il repository '%s'" @@ -588,8 +613,8 @@ #: lib/libalpm/conflict.c:296 lib/libalpm/deps.c:57 lib/libalpm/deps.c:598 #: lib/libalpm/deps.c:638 lib/libalpm/group.c:43 lib/libalpm/handle.c:49 -#: lib/libalpm/package.c:80 lib/libalpm/sync.c:65 lib/libalpm/sync.c:604 -#: lib/libalpm/sync.c:620 lib/libalpm/sync.c:716 lib/libalpm/trans.c:52 +#: lib/libalpm/package.c:80 lib/libalpm/sync.c:65 lib/libalpm/sync.c:607 +#: lib/libalpm/sync.c:623 lib/libalpm/sync.c:719 lib/libalpm/trans.c:52 #: lib/libalpm/util.c:607 lib/libalpm/util.c:614 #, c-format msgid "malloc failure: could not allocate %d bytes" @@ -812,7 +837,7 @@ msgid "operation not compatible with the transaction type" msgstr "operazione non possibile" -#: lib/libalpm/error.c:91 lib/libalpm/sync.c:982 +#: lib/libalpm/error.c:91 lib/libalpm/sync.c:985 msgid "could not commit transaction" msgstr "impossibile eseguire l'operazione" @@ -924,6 +949,21 @@ msgid "unexpected error" msgstr "errore inaspettato" +#: lib/libalpm/handle.c:164 +#, c-format +msgid "option 'root' = %s" +msgstr "opzione 'root' = %s" + +#: lib/libalpm/handle.c:180 +#, c-format +msgid "option 'dbpath' = %s" +msgstr "opzione 'dbpath' = %s" + +#: lib/libalpm/handle.c:196 +#, c-format +msgid "option 'cachedir' = %s" +msgstr "opzione 'cachedir' = %s" + #: lib/libalpm/md5driver.c:51 lib/libalpm/sha1.c:398 #, c-format msgid "%s can't be opened\n" @@ -1026,265 +1066,280 @@ msgid "cannot remove file '%s': %s" msgstr "impossibile rimuovere il file '%s': %s" -#: lib/libalpm/remove.c:218 +#: lib/libalpm/remove.c:212 +#, c-format +msgid "Skipping removal of '%s' due to NoUpgrade" +msgstr "rimozione di '%s' ignorata dovuta a NoUpgrade" + +#: lib/libalpm/remove.c:219 #, c-format msgid "file %s does not exist" msgstr "il file %s non esiste" -#: lib/libalpm/remove.c:225 +#: lib/libalpm/remove.c:226 #, c-format msgid "keeping directory %s" msgstr "conservazione in corso della directory %s" -#: lib/libalpm/remove.c:227 +#: lib/libalpm/remove.c:228 #, c-format msgid "removing directory %s" msgstr "rimozione in corso della directory %s" -#: lib/libalpm/remove.c:234 +#: lib/libalpm/remove.c:235 #, c-format msgid "%s is in trans->skip_remove, skipping removal" msgstr "%s è in trans->skip_remove, rimozione ignorata" -#: lib/libalpm/remove.c:244 +#: lib/libalpm/remove.c:246 #, c-format msgid "%s saved as %s" msgstr "%s salvato come %s" -#: lib/libalpm/remove.c:248 +#: lib/libalpm/remove.c:249 +#, c-format +msgid "transaction is set to NOSAVE, not backing up '%s'" +msgstr "operazione impostata su NOSAVE, nessun backup di '%s'" + +#: lib/libalpm/remove.c:253 #, c-format msgid "unlinking %s" msgstr "scollegamento in corso di %s" -#: lib/libalpm/remove.c:255 +#: lib/libalpm/remove.c:260 #, c-format msgid "cannot remove file %s: %s" msgstr "impossibile rimuovere il file %s: %s" -#: lib/libalpm/remove.c:282 +#: lib/libalpm/remove.c:286 #, c-format msgid "removing package %s-%s" msgstr "rimozione in corso del pacchetto %s-%s" -#: lib/libalpm/remove.c:294 +#: lib/libalpm/remove.c:298 #, c-format msgid "not removing package '%s', can't remove all files" msgstr "impossibile rimuovere il pacchetto '%s' e tutti i file" -#: lib/libalpm/remove.c:300 +#: lib/libalpm/remove.c:304 msgid "removing files" msgstr "rimozione dei file in corso" -#: lib/libalpm/remove.c:318 +#: lib/libalpm/remove.c:322 #, c-format msgid "removing database entry '%s'" msgstr "rimozione in corso della voce del database '%s'" -#: lib/libalpm/remove.c:320 +#: lib/libalpm/remove.c:324 #, c-format msgid "could not remove database entry %s-%s" msgstr "impossibile rimuovere la voce del database %s-%s" -#: lib/libalpm/remove.c:323 +#: lib/libalpm/remove.c:327 #, c-format msgid "could not remove entry '%s' from cache" msgstr "impossibile rimuovere la voce '%s' dalla cache" -#: lib/libalpm/sync.c:200 +#: lib/libalpm/sync.c:199 msgid "checking for package upgrades" msgstr "controllo in corso degli aggiornamenti del pacchetto" -#: lib/libalpm/sync.c:277 +#: lib/libalpm/sync.c:232 +#, c-format +msgid "%s-%s: ignoring package upgrade (%s => %s)" +msgstr "%s-%s: aggiornamento del pacchetto (%s => %s) ignorato" + +#: lib/libalpm/sync.c:281 #, c-format msgid "searching for target in repo '%s'" msgstr "ricerca in corso del pacchetto nel repository '%s'" -#: lib/libalpm/sync.c:286 lib/libalpm/sync.c:309 +#: lib/libalpm/sync.c:290 lib/libalpm/sync.c:313 #, c-format msgid "target '%s' not found -- looking for provisions" msgstr "pacchetto '%s' non trovato -- ricerca delle alternative" -#: lib/libalpm/sync.c:291 lib/libalpm/sync.c:314 +#: lib/libalpm/sync.c:295 lib/libalpm/sync.c:318 #, c-format msgid "found '%s' as a provision for '%s'" msgstr "trovato '%s' come alternativa a '%s'" -#: lib/libalpm/sync.c:298 +#: lib/libalpm/sync.c:302 #, c-format msgid "repository '%s' not found" msgstr "repository '%s' non trovato" -#: lib/libalpm/sync.c:332 +#: lib/libalpm/sync.c:336 #, c-format msgid "%s-%s is up to date -- skipping" msgstr "%s-%s è aggiornato -- verrà ignorato" -#: lib/libalpm/sync.c:352 +#: lib/libalpm/sync.c:356 #, c-format msgid "adding target '%s' to the transaction set" msgstr "aggiunta in corso di '%s'" -#: lib/libalpm/sync.c:398 +#: lib/libalpm/sync.c:401 msgid "resolving target's dependencies" msgstr "risoluzione in corso delle dipendenze dei pacchetti" -#: lib/libalpm/sync.c:418 +#: lib/libalpm/sync.c:421 #, c-format msgid "adding package %s-%s to the transaction targets" msgstr "aggiunta in corso del pacchetto %s-%s" -#: lib/libalpm/sync.c:453 +#: lib/libalpm/sync.c:456 msgid "looking for unresolvable dependencies" msgstr "ricerca in corso delle dipendenze irrisolvibili" -#: lib/libalpm/sync.c:484 +#: lib/libalpm/sync.c:487 #, c-format msgid "package '%s' is conflicting with '%s'" msgstr "il pacchetto '%s' va in conflitto con '%s'" -#: lib/libalpm/sync.c:506 +#: lib/libalpm/sync.c:509 #, c-format msgid "'%s' not found in transaction set -- skipping" msgstr "'%s' non trovato -- verrà ignorato" -#: lib/libalpm/sync.c:517 +#: lib/libalpm/sync.c:520 #, c-format msgid "package '%s' provides its own conflict" msgstr "il pacchetto '%s' fornisce il suo stesso conflitto" -#: lib/libalpm/sync.c:540 lib/libalpm/sync.c:545 +#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548 #, c-format msgid "'%s' is in the target list -- keeping it" msgstr "'%s' è nella lista dei pacchetti -- verrà conservato" -#: lib/libalpm/sync.c:557 lib/libalpm/sync.c:594 +#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597 #, c-format msgid "removing '%s' from target list" msgstr "rimozione in corso di '%s' dalla lista dei pacchetti" -#: lib/libalpm/sync.c:566 +#: lib/libalpm/sync.c:569 #, c-format msgid "resolving package '%s' conflict" msgstr "risoluzione in corso del conflitto del pacchetto '%s'" -#: lib/libalpm/sync.c:589 +#: lib/libalpm/sync.c:592 #, c-format msgid "electing '%s' for removal" msgstr "selezionato '%s' per la rimozione" -#: lib/libalpm/sync.c:600 lib/libalpm/sync.c:616 +#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619 msgid "unresolvable package conflicts detected" msgstr "sono stati rilevati dei conflitti irrisolvibili" -#: lib/libalpm/sync.c:668 +#: lib/libalpm/sync.c:671 msgid "checking dependencies of packages designated for removal" msgstr "" "controllo in corso delle dipendenze dei pacchetti designati per la rimozione" -#: lib/libalpm/sync.c:682 +#: lib/libalpm/sync.c:685 msgid "something has gone horribly wrong" msgstr "qualcosa è andato orribilmente storto" -#: lib/libalpm/sync.c:701 +#: lib/libalpm/sync.c:704 #, c-format msgid "found '%s' as a provision for '%s' -- conflict aborted" msgstr "trovato '%s' come alternativa a '%s' -- conflitto annullato" -#: lib/libalpm/sync.c:797 +#: lib/libalpm/sync.c:800 #, c-format msgid "%s is already in the cache\n" msgstr "%s è già presente nella cache\n" -#: lib/libalpm/sync.c:808 +#: lib/libalpm/sync.c:811 #, c-format msgid "no %s cache exists. creating...\n" msgstr "non esiste la cache %s. creazione in corso...\n" -#: lib/libalpm/sync.c:809 +#: lib/libalpm/sync.c:812 #, c-format msgid "warning: no %s cache exists. creating..." msgstr "attenzione: non esiste la cache %s. creazione in corso..." -#: lib/libalpm/sync.c:814 +#: lib/libalpm/sync.c:817 msgid "couldn't create package cache, using /tmp instead\n" msgstr "" "impossibile creare la cache del pacchetto, al suo posto verrà usata /tmp\n" -#: lib/libalpm/sync.c:815 +#: lib/libalpm/sync.c:818 msgid "warning: couldn't create package cache, using /tmp instead" msgstr "" "attenzione: impossibile creare la cache del pacchetto, al suo posto verrà " "usata /tmp" -#: lib/libalpm/sync.c:822 +#: lib/libalpm/sync.c:825 #, c-format msgid "failed to retrieve some files from %s\n" msgstr "impossibile recuperare alcuni file da %s\n" -#: lib/libalpm/sync.c:851 lib/libalpm/sync.c:863 +#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866 #, c-format msgid "can't get md5 or sha1 checksum for package %s\n" msgstr "impossibile recuperare il checksum md5 o sha1 del pacchetto %s\n" -#: lib/libalpm/sync.c:882 +#: lib/libalpm/sync.c:885 #, c-format msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" msgstr "archivio %s era corrotto (MD5 o SHA1 checksum errato)\n" -#: lib/libalpm/sync.c:884 +#: lib/libalpm/sync.c:887 #, c-format msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" msgstr "archivio %s è corrotto (MD5 o SHA1 checksum errato)\n" -#: lib/libalpm/sync.c:905 +#: lib/libalpm/sync.c:908 msgid "could not create removal transaction" msgstr "impossibile avviare l'operazione di rimozione" -#: lib/libalpm/sync.c:911 +#: lib/libalpm/sync.c:914 msgid "could not initialize the removal transaction" msgstr "impossibile inizializzare l'operazione di rimozione" -#: lib/libalpm/sync.c:931 +#: lib/libalpm/sync.c:934 msgid "removing conflicting and to-be-replaced packages" msgstr "rimozione in corso dei pacchetti in conflitto e da sostituire" -#: lib/libalpm/sync.c:933 +#: lib/libalpm/sync.c:936 msgid "could not prepare removal transaction" msgstr "impossibile preparare l'operazione di rimozione" -#: lib/libalpm/sync.c:939 +#: lib/libalpm/sync.c:942 msgid "could not commit removal transaction" msgstr "impossibile eseguire l'operazione di rimozione" -#: lib/libalpm/sync.c:946 +#: lib/libalpm/sync.c:949 msgid "installing packages" msgstr "installazione dei pacchetti in corso" -#: lib/libalpm/sync.c:949 +#: lib/libalpm/sync.c:952 msgid "could not create transaction" msgstr "impossibile avviare l'operazione" -#: lib/libalpm/sync.c:954 +#: lib/libalpm/sync.c:957 msgid "could not initialize transaction" msgstr "impossibile inizializzare l'operazione" -#: lib/libalpm/sync.c:977 +#: lib/libalpm/sync.c:980 msgid "could not prepare transaction" msgstr "impossibile preparare l'operazione" -#: lib/libalpm/sync.c:989 +#: lib/libalpm/sync.c:992 msgid "updating database for replaced packages' dependencies" msgstr "" "aggiornamento in corso del database per le dipendenze dei pacchetti " "sostituiti" -#: lib/libalpm/sync.c:1018 +#: lib/libalpm/sync.c:1021 #, c-format msgid "could not update requiredby for database entry %s-%s" msgstr "" "impossibile aggiornare il campo 'richiesto da' per la voce del database %s-%s" -#: lib/libalpm/sync.c:1027 +#: lib/libalpm/sync.c:1030 #, c-format msgid "could not update new database entry %s-%s" msgstr "impossibile aggiornare la nuova voce del database %s-%s" @@ -1402,7 +1457,3 @@ #~ msgid "loading ALL info for '%s'" #~ msgstr "caricamento in corso di tutte le informazioni di '%s'" - -#~ msgid "skipping removal of %s as it has moved to another package" -#~ msgstr "" -#~ "rimozione di %s ignorata poichè è stato spostato in un altro pacchetto" Index: pacman-lib/src/pacman/po/it.po diff -u pacman-lib/src/pacman/po/it.po:1.7 pacman-lib/src/pacman/po/it.po:1.8 --- pacman-lib/src/pacman/po/it.po:1.7 Tue Feb 20 14:33:14 2007 +++ pacman-lib/src/pacman/po/it.po Wed Feb 21 14:27:38 2007 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-02-20 19:47+0100\n" -"PO-Revision-Date: 2007-02-20 20:00+0100\n" +"POT-Creation-Date: 2007-02-21 19:46+0100\n" +"PO-Revision-Date: 2007-02-21 20:00+0100\n" "Last-Translator: Giovanni Scafora <linuxmania(a)gmail.com>\n" "Language-Team: Arch Linux Italian Team <linuxmania(a)gmail.com>\n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79 -#: src/pacman/sync.c:480 src/pacman/sync.c:529 +#: src/pacman/sync.c:482 src/pacman/sync.c:531 #, c-format msgid "" " if you're sure a package manager is not already running,\n" @@ -37,14 +37,14 @@ msgid "failed to add target '%s' (%s)" msgstr "impossibile aggiungere il pacchetto '%s' (%s)" -#: src/pacman/add.c:85 src/pacman/sync.c:194 src/pacman/trans.c:70 +#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:70 #: src/pacman/trans.c:77 src/pacman/trans.c:81 src/pacman/trans.c:91 #: src/pacman/trans.c:105 src/pacman/trans.c:119 src/pacman/trans.c:131 #: src/pacman/trans.c:142 msgid "done.\n" msgstr "fatto.\n" -#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:614 +#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:616 #, c-format msgid "failed to prepare transaction (%s)\n" msgstr "preparazione non riuscita (%s)\n" @@ -54,22 +54,22 @@ msgid ":: %s: requires %s" msgstr ":: %s: richiede %s" -#: src/pacman/add.c:118 src/pacman/sync.c:643 +#: src/pacman/add.c:118 src/pacman/sync.c:645 #, c-format msgid ":: %s: conflicts with %s" msgstr ":: %s: va in conflitto con %s" -#: src/pacman/add.c:127 src/pacman/sync.c:707 +#: src/pacman/add.c:127 src/pacman/sync.c:709 #, c-format msgid "%s%s exists in both '%s' and '%s'\n" msgstr "%s%s è presente in '%s' e in '%s'\n" -#: src/pacman/add.c:134 src/pacman/sync.c:714 +#: src/pacman/add.c:134 src/pacman/sync.c:716 #, c-format msgid "%s: %s%s exists in filesystem\n" msgstr "%s: %s%s è già presente nel filesystem\n" -#: src/pacman/add.c:141 src/pacman/sync.c:721 src/pacman/sync.c:727 +#: src/pacman/add.c:141 src/pacman/sync.c:723 src/pacman/sync.c:729 msgid "" "\n" "errors occurred, no packages were upgraded.\n" @@ -77,18 +77,18 @@ "\n" "si sono verificati degli errori, nessun pacchetto è stato aggiornato.\n" -#: src/pacman/add.c:151 src/pacman/sync.c:650 +#: src/pacman/add.c:151 src/pacman/sync.c:652 #, c-format msgid ":: %.1f MB required, have %.1f MB" msgstr ":: %.1f MB richiesti, spazio a disposizione %.1f MB" -#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:700 +#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:702 #, c-format msgid "failed to commit transaction (%s)\n" msgstr "impossibile eseguire l'operazione richiesta (%s)\n" -#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:522 -#: src/pacman/sync.c:743 +#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:524 +#: src/pacman/sync.c:745 #, c-format msgid "failed to release transaction (%s)\n" msgstr "impossibile annullare l'operazione richiesta (%s)\n" @@ -648,62 +648,62 @@ msgid " the terms of the GNU General Public License\n" msgstr " the terms of the GNU General Public License\n" -#: src/pacman/pacman.c:299 +#: src/pacman/pacman.c:298 #, c-format msgid "'%s' is not a valid debug level" msgstr "'%s' livello di debug non valido" -#: src/pacman/pacman.c:315 +#: src/pacman/pacman.c:313 #, c-format msgid "'%s' is not a valid cache directory\n" msgstr "'%s' non è una directory di cache valida\n" -#: src/pacman/pacman.c:341 +#: src/pacman/pacman.c:339 #, c-format msgid "'%s' is not a valid db path\n" msgstr "'%s' non è un path del database valido\n" -#: src/pacman/pacman.c:371 +#: src/pacman/pacman.c:369 #, c-format msgid "'%s' is not a valid root path\n" msgstr "'%s' path di root non valido\n" -#: src/pacman/pacman.c:398 +#: src/pacman/pacman.c:396 msgid "only one operation may be used at a time\n" msgstr "è consentito eseguire solo un'operazione per volta\n" -#: src/pacman/pacman.c:444 +#: src/pacman/pacman.c:442 msgid "warning: current locale is invalid; using default \"C\" locale" msgstr "attenzione: locale non valido, verrà utilizzato il locale \"C\"" -#: src/pacman/pacman.c:463 +#: src/pacman/pacman.c:461 #, c-format msgid "failed to initilize alpm library (%s)\n" msgstr "impossibile inizializzare la libreria alpm (%s)\n" -#: src/pacman/pacman.c:496 +#: src/pacman/pacman.c:494 msgid "you cannot perform this operation unless you are root.\n" msgstr "operazione possibile solo da root.\n" -#: src/pacman/pacman.c:512 +#: src/pacman/pacman.c:510 #, c-format msgid "failed to parse config (%s)\n" msgstr "impossibile analizzare la configurazione (%s)\n" -#: src/pacman/pacman.c:522 src/pacman/remove.c:125 src/pacman/util.c:323 +#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323 msgid "Targets:" msgstr "Pacchetti:" -#: src/pacman/pacman.c:528 +#: src/pacman/pacman.c:526 #, c-format msgid "could not register 'local' database (%s)\n" msgstr "impossibile registrare il database 'locale' (%s)\n" -#: src/pacman/pacman.c:535 +#: src/pacman/pacman.c:533 msgid "no targets specified (use -h for help)\n" msgstr "nessun pacchetto specificato (usare -h per un aiuto)\n" -#: src/pacman/pacman.c:548 +#: src/pacman/pacman.c:546 msgid "no operation specified (use -h for help)\n" msgstr "nessuna operazione specificata (usare -h per un aiuto)\n" @@ -721,7 +721,7 @@ msgid "No package owns %s\n" msgstr "Nessun pacchetto contiene %s\n" -#: src/pacman/query.c:119 src/pacman/sync.c:451 +#: src/pacman/query.c:119 src/pacman/sync.c:453 msgid "no usable package repositories configured.\n" msgstr "nessun repository configurato.\n" @@ -752,7 +752,7 @@ msgid "package \"%s\" not found\n" msgstr "pacchetto \"%s\" non trovato\n" -#: src/pacman/remove.c:58 src/pacman/sync.c:566 +#: src/pacman/remove.c:58 src/pacman/sync.c:568 #, c-format msgid ":: group %s:\n" msgstr ":: gruppo %s:\n" @@ -766,7 +766,7 @@ msgid ":: Remove %s from group %s? [Y/n] " msgstr ":: Rimuovere %s dal gruppo %s? [Y/n] " -#: src/pacman/remove.c:77 src/pacman/sync.c:478 src/pacman/sync.c:527 +#: src/pacman/remove.c:77 src/pacman/sync.c:480 src/pacman/sync.c:529 #, c-format msgid "failed to init transaction (%s)\n" msgstr "inizializzazione non riuscita (%s)\n" @@ -789,90 +789,90 @@ "\n" "Rimuovere questi pacchetti? [Y/n] " -#: src/pacman/sync.c:113 +#: src/pacman/sync.c:115 msgid "Do you want to remove old packages from cache? [Y/n] " msgstr "Rimuovere i vecchi pacchetti dalla cache? [Y/n] " -#: src/pacman/sync.c:115 +#: src/pacman/sync.c:117 msgid "removing old packages from cache... " msgstr "rimozione dei vecchi pacchetti dalla cache in corso... " -#: src/pacman/sync.c:118 +#: src/pacman/sync.c:120 msgid "could not access cache directory\n" msgstr "impossibile accedere alla directory di cache\n" -#: src/pacman/sync.c:179 +#: src/pacman/sync.c:181 msgid "Do you want to remove all packages from cache? [Y/n] " msgstr "Rimuovere tutti i pacchetti dalla cache? [Y/n] " -#: src/pacman/sync.c:181 +#: src/pacman/sync.c:183 msgid "removing all packages from cache... " msgstr "rimozione di tutti i pacchetti dalla cache in corso... " -#: src/pacman/sync.c:184 +#: src/pacman/sync.c:186 msgid "could not remove cache directory\n" msgstr "impossibile rimuovere la directory di cache\n" -#: src/pacman/sync.c:189 +#: src/pacman/sync.c:191 msgid "could not create new cache directory\n" msgstr "impossibile creare una nuova directory di cache\n" -#: src/pacman/sync.c:216 +#: src/pacman/sync.c:218 #, c-format msgid "failed to synchronize %s: %s\n" msgstr "impossibile sincronizzare %s: %s\n" -#: src/pacman/sync.c:218 +#: src/pacman/sync.c:220 #, c-format msgid "failed to update %s (%s)\n" msgstr "impossibile aggiornare %s (%s)\n" -#: src/pacman/sync.c:221 +#: src/pacman/sync.c:223 #, c-format msgid " %s is up to date\n" msgstr " %s è aggiornato\n" -#: src/pacman/sync.c:343 +#: src/pacman/sync.c:345 #, c-format msgid "repository '%s' does not exist\n" msgstr "impossibile trovare il repository '%s'\n" -#: src/pacman/sync.c:359 +#: src/pacman/sync.c:361 #, c-format msgid "package '%s' was not found in repository '%s'\n" msgstr "impossibile trovare il pacchetto '%s' nel repository '%s'\n" -#: src/pacman/sync.c:379 +#: src/pacman/sync.c:381 #, c-format msgid "package '%s' was not found\n" msgstr "impossibile trovare il pacchetto '%s'\n" -#: src/pacman/sync.c:416 +#: src/pacman/sync.c:418 #, c-format msgid "repository \"%s\" was not found.\n" msgstr "impossibile trovare il repository \"%s\".\n" -#: src/pacman/sync.c:488 +#: src/pacman/sync.c:490 msgid ":: Synchronizing package databases...\n" msgstr ":: Sincronizzazione dei database in corso...\n" -#: src/pacman/sync.c:489 +#: src/pacman/sync.c:491 msgid "synchronizing package lists" msgstr "sincronizzazione della lista dei pacchetti in corso" -#: src/pacman/sync.c:491 +#: src/pacman/sync.c:493 msgid "failed to synchronize any databases" msgstr "impossibile sincronizzare i database" -#: src/pacman/sync.c:497 +#: src/pacman/sync.c:499 msgid ":: Starting full system upgrade...\n" msgstr ":: Aggiornamento del sistema in corso...\n" -#: src/pacman/sync.c:498 +#: src/pacman/sync.c:500 msgid "starting full system upgrade" msgstr "aggiornamento del sistema in corso" -#: src/pacman/sync.c:516 +#: src/pacman/sync.c:518 msgid "" "\n" ":: pacman has detected a newer version of the \"pacman\" package.\n" @@ -880,55 +880,55 @@ "\n" ":: pacman ha rilevato una versione più recente di \"pacman\".\n" -#: src/pacman/sync.c:517 +#: src/pacman/sync.c:519 msgid ":: It is recommended that you allow pacman to upgrade itself\n" msgstr ":: Si consiglia di consentire a pacman di aggiornarsi\n" -#: src/pacman/sync.c:518 +#: src/pacman/sync.c:520 msgid ":: first, then you can re-run the operation with the newer version.\n" msgstr ":: adesso e riavviare l'operazione con la versione più recente.\n" -#: src/pacman/sync.c:520 +#: src/pacman/sync.c:522 msgid ":: Upgrade pacman first? [Y/n] " msgstr ":: Aggiornare adesso pacman? [Y/n] " -#: src/pacman/sync.c:535 +#: src/pacman/sync.c:537 #, c-format msgid "pacman: %s\n" msgstr "pacman: %s\n" -#: src/pacman/sync.c:555 +#: src/pacman/sync.c:557 #, c-format msgid "'%s': %s\n" msgstr "'%s': %s\n" -#: src/pacman/sync.c:570 +#: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " msgstr ":: Installare tutto il contenuto? [Y/n] " -#: src/pacman/sync.c:577 +#: src/pacman/sync.c:579 #, c-format msgid ":: Install %s from group %s? [Y/n] " msgstr ":: Installare %s dal gruppo %s? [Y/n] " -#: src/pacman/sync.c:601 +#: src/pacman/sync.c:603 #, c-format msgid "'%s': not found in sync db\n" msgstr "'%s': non trovato nel database\n" -#: src/pacman/sync.c:621 +#: src/pacman/sync.c:623 msgid "requires" msgstr "richiede" -#: src/pacman/sync.c:621 +#: src/pacman/sync.c:623 msgid "is required by" msgstr "è richiesto da" -#: src/pacman/sync.c:663 -msgid "local database is up to date\n" -msgstr "Il database locale è aggiornato\n" +#: src/pacman/sync.c:665 +msgid " local database is up to date\n" +msgstr " Il database locale è aggiornato\n" -#: src/pacman/sync.c:672 +#: src/pacman/sync.c:674 msgid "" "\n" "Beginning download...\n" @@ -936,11 +936,11 @@ "\n" "Download in corso...\n" -#: src/pacman/sync.c:676 +#: src/pacman/sync.c:678 msgid "Proceed with download? [Y/n] " msgstr "Procedere con il download? [Y/n] " -#: src/pacman/sync.c:684 +#: src/pacman/sync.c:686 msgid "" "\n" "Beginning upgrade process...\n" @@ -948,7 +948,7 @@ "\n" "Aggiornamento in corso...\n" -#: src/pacman/sync.c:688 +#: src/pacman/sync.c:690 msgid "Proceed with installation? [Y/n] " msgstr "Procedere con l'installazione? [Y/n] "

1 0