- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/lib/libalpm (add.c remove.c util.c)
by Aaron Griffin 22 Mar '07

22 Mar '07

Date: Thursday, March 22, 2007 @ 04:22:49 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.127 -> 1.128) remove.c (1.75 -> 1.76) util.c (1.50 -> 1.51) * Correct install scriptlet usage (reuse of handle->root when not needed) * Skip running scriptlet when chroot fails - to prevent issues in the host filesystem ----------+ add.c | 15 ++++++++------- remove.c | 12 +++++------- util.c | 2 ++ 3 files changed, 15 insertions(+), 14 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.127 pacman-lib/lib/libalpm/add.c:1.128 --- pacman-lib/lib/libalpm/add.c:1.127 Sun Mar 11 17:10:03 2007 +++ pacman-lib/lib/libalpm/add.c Thu Mar 22 04:22:48 2007 @@ -318,6 +318,7 @@ pkg_count = alpm_list_count(trans->targets); for(targ = trans->packages; targ; targ = targ->next) { + char scriptlet[PATH_MAX+1]; int targ_count = 0, is_upgrade = 0, use_md5 = 0; double percent = 0.0; pmpkg_t *newpkg = (pmpkg_t *)targ->data; @@ -328,6 +329,9 @@ break; } + snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path, + alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); + /* check if we have a valid sha1sum, if not, use MD5 */ if(strlen(newpkg->sha1sum) == 0) { use_md5 = 1; @@ -357,7 +361,7 @@ /* pre_upgrade scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle->root, newpkg->data, "pre_upgrade", newpkg->version, oldpkg->version, trans); + _alpm_runscriptlet(handle->root, scriptlet, "pre_upgrade", newpkg->version, oldpkg->version, trans); } } else { is_upgrade = 0; @@ -367,7 +371,7 @@ /* pre_install scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle->root, newpkg->data, "pre_install", newpkg->version, NULL, trans); + _alpm_runscriptlet(handle->root, scriptlet, "pre_install", newpkg->version, NULL, trans); } } @@ -817,15 +821,12 @@ /* run the post-install script if it exists */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - char pm_install[PATH_MAX]; - snprintf(pm_install, PATH_MAX, "%s%s%s-%s/install", handle->root, db->path, - alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); if(is_upgrade) { - _alpm_runscriptlet(handle->root, pm_install, "post_upgrade", + _alpm_runscriptlet(handle->root, scriptlet, "post_upgrade", alpm_pkg_get_version(newpkg), oldpkg ? alpm_pkg_get_version(oldpkg) : NULL, trans); } else { - _alpm_runscriptlet(handle->root, pm_install, "post_install", + _alpm_runscriptlet(handle->root, scriptlet, "post_install", alpm_pkg_get_version(newpkg), NULL, trans); } } Index: pacman-lib/lib/libalpm/remove.c diff -u pacman-lib/lib/libalpm/remove.c:1.75 pacman-lib/lib/libalpm/remove.c:1.76 --- pacman-lib/lib/libalpm/remove.c:1.75 Fri Mar 9 00:33:06 2007 +++ pacman-lib/lib/libalpm/remove.c Thu Mar 22 04:22:48 2007 @@ -275,7 +275,7 @@ for(targ = trans->packages; targ; targ = targ->next) { int position = 0; - char pm_install[PATH_MAX]; + char scriptlet[PATH_MAX]; alpm_list_t *files; info = (pmpkg_t*)targ->data; const char *pkgname = NULL; @@ -284,6 +284,8 @@ break; } + snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path, + pkgname, alpm_pkg_get_version(info)); /* get the name now so we can use it after package is removed */ pkgname = alpm_pkg_get_name(info); @@ -294,9 +296,7 @@ /* run the pre-remove scriptlet if it exists */ if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db->path, - pkgname, alpm_pkg_get_version(info)); - _alpm_runscriptlet(handle->root, pm_install, "pre_remove", + _alpm_runscriptlet(handle->root, scriptlet, "pre_remove", alpm_pkg_get_version(info), NULL, trans); } } @@ -324,9 +324,7 @@ if(trans->type != PM_TRANS_TYPE_UPGRADE) { /* run the post-remove script if it exists */ if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db->path, - pkgname, alpm_pkg_get_version(info)); - _alpm_runscriptlet(handle->root, pm_install, "post_remove", + _alpm_runscriptlet(handle->root, scriptlet, "post_remove", alpm_pkg_get_version(info), NULL, trans); } } Index: pacman-lib/lib/libalpm/util.c diff -u pacman-lib/lib/libalpm/util.c:1.50 pacman-lib/lib/libalpm/util.c:1.51 --- pacman-lib/lib/libalpm/util.c:1.50 Mon Mar 19 00:49:28 2007 +++ pacman-lib/lib/libalpm/util.c Thu Mar 22 04:22:48 2007 @@ -431,6 +431,7 @@ if(stat(installfn, &buf)) { /* not found */ + _alpm_log(PM_LOG_DEBUG, "scriptlet '%s' not found", installfn); return(0); } @@ -469,6 +470,7 @@ /* just in case our cwd was removed in the upgrade operation */ if(chdir(root) != 0) { _alpm_log(PM_LOG_ERROR, _("could not change directory to %s (%s)"), root, strerror(errno)); + goto cleanup; } _alpm_log(PM_LOG_DEBUG, _("executing %s script..."), script);

1 0

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

22 Mar '07

Date: Thursday, March 22, 2007 @ 03:32:54 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: query.c (1.31 -> 1.32) * -Qo now properly resolves paths when finding an owner NOTE that we do NOT want symlinked *files* resolved, only paths (i.e. /usr/lib/perl5/site_perl/*) ---------+ query.c | 53 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.31 pacman-lib/src/pacman/query.c:1.32 --- pacman-lib/src/pacman/query.c:1.31 Tue Mar 20 23:38:43 2007 +++ pacman-lib/src/pacman/query.c Thu Mar 22 03:32:54 2007 @@ -28,6 +28,7 @@ #include <sys/stat.h> #include <libintl.h> #include <errno.h> +#include <unistd.h> #include <alpm.h> #include <alpm_list.h> @@ -43,11 +44,43 @@ extern config_t *config; extern pmdb_t *db_local; +static char *resolve_path(const char* file) +{ + char *copy, *p, *str = NULL; + + if(!(copy = strdup(file))) { + return(NULL); + } + + if((p = strrchr(copy, '/')) == NULL) { + return(copy); + } else { + *p = '\0'; ++p; + + str = calloc(PATH_MAX+1, sizeof(char)); + if(!str) { + /* null hmmm.... */ + return(NULL); + } + + if(!realpath(copy, str)) { + return(NULL); + } + + str[strlen(str)] = '/'; + strcat(str, p); + } + + free(copy); + return(str); +} + + static void query_fileowner(pmdb_t *db, char *filename) { struct stat buf; int gotcha = 0; - char rpath[PATH_MAX]; + char *rpath; alpm_list_t *i, *j; if(db == NULL) { @@ -68,7 +101,7 @@ return; } - if(realpath(filename, rpath) == NULL) { + if(!(rpath = resolve_path(filename))) { ERR(NL, _("cannot determine real path for '%s': %s"), filename, strerror(errno)); return; } @@ -77,20 +110,24 @@ pmpkg_t *info = alpm_list_getdata(i); for(j = alpm_pkg_get_files(info); j && !gotcha; j = alpm_list_next(j)) { - char path[PATH_MAX]; - char *filename = alpm_list_getdata(j); - snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), filename); + char path[PATH_MAX], *ppath; + snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), (const char *)alpm_list_getdata(j)); + + ppath = resolve_path(path); - if(strcmp(path, rpath) == 0) { - printf(_("%s is owned by %s %s\n"), path, alpm_pkg_get_name(info), alpm_pkg_get_version(info)); + if(ppath && strcmp(ppath, rpath) == 0) { + printf(_("%s is owned by %s %s\n"), filename, alpm_pkg_get_name(info), alpm_pkg_get_version(info)); gotcha = 1; - break; } + + free(ppath); } } if(!gotcha) { ERR(NL, _("No package owns %s\n"), filename); } + + free(rpath); } int pacman_query(alpm_list_t *targets)

1 0

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

22 Mar '07

Date: Thursday, March 22, 2007 @ 02:25:26 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: conflict.c (1.46 -> 1.47) * Fix conflict checking to ignore symlinks that were in previous version of package. Regression from 2.9.8. ------------+ conflict.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) Index: pacman-lib/lib/libalpm/conflict.c diff -u pacman-lib/lib/libalpm/conflict.c:1.46 pacman-lib/lib/libalpm/conflict.c:1.47 --- pacman-lib/lib/libalpm/conflict.c:1.46 Mon Mar 5 17:13:33 2007 +++ pacman-lib/lib/libalpm/conflict.c Thu Mar 22 02:25:26 2007 @@ -366,14 +366,14 @@ return(conflicts); } +/* Find file conflicts that may occur during the transaction with two checks: + * 1: check every target against every target + * 2: check every target against the filesystem */ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root) { - alpm_list_t *i, *j, *k; - alpm_list_t *conflicts = NULL; - alpm_list_t *tmpfiles = NULL; + alpm_list_t *i, *conflicts = NULL; alpm_list_t *targets = trans->packages; int numtargs = alpm_list_count(targets); - double percent; ALPM_LOG_FUNC; @@ -382,17 +382,16 @@ } for(i = targets; i; i = i->next) { + alpm_list_t *j, *k, *tmpfiles = NULL; pmpkg_t *p1, *p2, *dbpkg; - char *filestr = NULL; char path[PATH_MAX+1]; - struct stat buf; p1 = i->data; if(!p1) { continue; } - percent = (double)(alpm_list_count(targets) - alpm_list_count(i) + 1) + double percent = (double)(alpm_list_count(targets) - alpm_list_count(i) + 1) / alpm_list_count(targets); PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", (percent * 100), numtargs, (numtargs - alpm_list_count(i) +1)); @@ -407,7 +406,6 @@ tmpfiles = chk_fileconflicts(alpm_pkg_get_files(p1), alpm_pkg_get_files(p2)); 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, path, @@ -418,6 +416,10 @@ } } + /* declarations for second check */ + struct stat buf; + char *filestr = NULL; + /* CHECK 2: check every target against the filesystem */ _alpm_log(PM_LOG_DEBUG, "searching for filesystem conflicts: %s", p1->name); dbpkg = _alpm_db_get_pkgfromcache(db, p1->name); @@ -443,6 +445,26 @@ if(lstat(path, &buf) == 0 && !S_ISDIR(buf.st_mode)) { _alpm_log(PM_LOG_DEBUG, "checking possible conflict: %s", path); + /* Make sure the possible conflict is not a symlink that points to a + * path in the old package. This is kind of dirty with inode usage */ + if(dbpkg) { + struct stat buf2; + char str[PATH_MAX+1]; + unsigned ok = 0; + for(k = dbpkg->files; k; k = k->next) { + snprintf(str, PATH_MAX, "%s%s", root, (char*)k->data); + lstat(str, &buf2); + if(buf.st_ino == buf2.st_ino) { + ok = 1; + _alpm_log(PM_LOG_DEBUG, "conflict was a symlink: %s", path); + break; + } + } + if(ok == 1) { + continue; + } + } + /* 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) {

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman/po (8 files)
by Aaron Griffin 22 Mar '07

22 Mar '07

Date: Wednesday, March 21, 2007 @ 21:00:30 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: de.po (1.15 -> 1.16) en_GB.po (1.3 -> 1.4) fr.po (1.11 -> 1.12) hu.po (1.12 -> 1.13) it.po (1.18 -> 1.19) pacman.pot (1.10 -> 1.11) pt_BR.po (1.10 -> 1.11) ru_RU.po (1.2 -> 1.3) * Quick fixup for the translations due to a typo fix committed earlier. ------------+ de.po | 2 +- en_GB.po | 4 ++-- fr.po | 2 +- hu.po | 2 +- it.po | 2 +- pacman.pot | 2 +- pt_BR.po | 2 +- ru_RU.po | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) Index: pacman-lib/src/pacman/po/de.po diff -u pacman-lib/src/pacman/po/de.po:1.15 pacman-lib/src/pacman/po/de.po:1.16 --- pacman-lib/src/pacman/po/de.po:1.15 Sun Mar 18 22:45:01 2007 +++ pacman-lib/src/pacman/po/de.po Wed Mar 21 21:00:29 2007 @@ -641,7 +641,7 @@ #: src/pacman/pacman.c:455 #, c-format -msgid "failed to initilize alpm library (%s)\n" +msgid "failed to initialize alpm library (%s)\n" msgstr "Konnte alpm-Bibliothek nicht initialisieren (%s)\n" #: src/pacman/pacman.c:488 Index: pacman-lib/src/pacman/po/en_GB.po diff -u pacman-lib/src/pacman/po/en_GB.po:1.3 pacman-lib/src/pacman/po/en_GB.po:1.4 --- pacman-lib/src/pacman/po/en_GB.po:1.3 Sun Mar 18 22:45:01 2007 +++ pacman-lib/src/pacman/po/en_GB.po Wed Mar 21 21:00:29 2007 @@ -648,8 +648,8 @@ #: src/pacman/pacman.c:455 #, c-format -msgid "failed to initilize alpm library (%s)\n" -msgstr "failed to initilise alpm library (%s)\n" +msgid "failed to initialize alpm library (%s)\n" +msgstr "failed to initialise alpm library (%s)\n" #: src/pacman/pacman.c:488 msgid "you cannot perform this operation unless you are root.\n" Index: pacman-lib/src/pacman/po/fr.po diff -u pacman-lib/src/pacman/po/fr.po:1.11 pacman-lib/src/pacman/po/fr.po:1.12 --- pacman-lib/src/pacman/po/fr.po:1.11 Sun Mar 18 22:45:01 2007 +++ pacman-lib/src/pacman/po/fr.po Wed Mar 21 21:00:29 2007 @@ -663,7 +663,7 @@ #: src/pacman/pacman.c:455 #, c-format -msgid "failed to initilize alpm library (%s)\n" +msgid "failed to initialize alpm library (%s)\n" msgstr "échec d'initialisation de la librairie alpm (%s)\n" #: src/pacman/pacman.c:488 Index: pacman-lib/src/pacman/po/hu.po diff -u pacman-lib/src/pacman/po/hu.po:1.12 pacman-lib/src/pacman/po/hu.po:1.13 --- pacman-lib/src/pacman/po/hu.po:1.12 Sun Mar 18 22:45:01 2007 +++ pacman-lib/src/pacman/po/hu.po Wed Mar 21 21:00:29 2007 @@ -641,7 +641,7 @@ #: src/pacman/pacman.c:455 #, c-format -msgid "failed to initilize alpm library (%s)\n" +msgid "failed to initialize alpm library (%s)\n" msgstr "nem sikerült inicializálni az alpm könyvtárat (%s)\n" #: src/pacman/pacman.c:488 Index: pacman-lib/src/pacman/po/it.po diff -u pacman-lib/src/pacman/po/it.po:1.18 pacman-lib/src/pacman/po/it.po:1.19 --- pacman-lib/src/pacman/po/it.po:1.18 Wed Mar 21 18:15:50 2007 +++ pacman-lib/src/pacman/po/it.po Wed Mar 21 21:00:29 2007 @@ -652,7 +652,7 @@ #: src/pacman/pacman.c:456 #, c-format -msgid "failed to initilize alpm library (%s)\n" +msgid "failed to initialize alpm library (%s)\n" msgstr "impossibile inizializzare la libreria alpm (%s)\n" #: src/pacman/pacman.c:489 Index: pacman-lib/src/pacman/po/pacman.pot diff -u pacman-lib/src/pacman/po/pacman.pot:1.10 pacman-lib/src/pacman/po/pacman.pot:1.11 --- pacman-lib/src/pacman/po/pacman.pot:1.10 Wed Mar 7 11:57:23 2007 +++ pacman-lib/src/pacman/po/pacman.pot Wed Mar 21 21:00:29 2007 @@ -617,7 +617,7 @@ #: src/pacman/pacman.c:455 #, c-format -msgid "failed to initilize alpm library (%s)\n" +msgid "failed to initialize alpm library (%s)\n" msgstr "" #: src/pacman/pacman.c:488 Index: pacman-lib/src/pacman/po/pt_BR.po diff -u pacman-lib/src/pacman/po/pt_BR.po:1.10 pacman-lib/src/pacman/po/pt_BR.po:1.11 --- pacman-lib/src/pacman/po/pt_BR.po:1.10 Wed Mar 7 11:57:23 2007 +++ pacman-lib/src/pacman/po/pt_BR.po Wed Mar 21 21:00:30 2007 @@ -667,7 +667,7 @@ #: src/pacman/pacman.c:455 #, c-format -msgid "failed to initilize alpm library (%s)\n" +msgid "failed to initialize alpm library (%s)\n" msgstr "falha ao iniciar biblioteca alpm (%s)\n" #: src/pacman/pacman.c:488 Index: pacman-lib/src/pacman/po/ru_RU.po diff -u pacman-lib/src/pacman/po/ru_RU.po:1.2 pacman-lib/src/pacman/po/ru_RU.po:1.3 --- pacman-lib/src/pacman/po/ru_RU.po:1.2 Wed Mar 14 11:02:53 2007 +++ pacman-lib/src/pacman/po/ru_RU.po Wed Mar 21 21:00:30 2007 @@ -647,7 +647,7 @@ #: src/pacman/pacman.c:455 #, c-format -msgid "failed to initilize alpm library (%s)\n" +msgid "failed to initialize alpm library (%s)\n" msgstr "ÐœÐµ ÑÐŽÐ°Ð»ÐŸÑÑ ÐžÐœÐžÑÐžÐ°Ð»ÐžÐ·ÐžÑÐŸÐ²Ð°ÑÑ Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÑ alpm (%s)\n" #: src/pacman/pacman.c:488

1 0

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

22 Mar '07

Date: Wednesday, March 21, 2007 @ 20:20:06 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: pacman.c (1.108 -> 1.109) Giovanni Scafora <linuxmania(a)gmail.com> * Fix typo in pacman.c ----------+ pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.108 pacman-lib/src/pacman/pacman.c:1.109 --- pacman-lib/src/pacman/pacman.c:1.108 Tue Mar 20 23:29:11 2007 +++ pacman-lib/src/pacman/pacman.c Wed Mar 21 20:20:05 2007 @@ -453,7 +453,7 @@ /* initialize pm library */ if(alpm_initialize() == -1) { - ERR(NL, _("failed to initilize alpm library (%s)\n"), alpm_strerror(pm_errno)); + ERR(NL, _("failed to initialize alpm library (%s)\n"), alpm_strerror(pm_errno)); cleanup(1); }

1 0

[pacman-dev] [patch] typo in pacman.c
by Giovanni Scafora 21 Mar '07

21 Mar '07

Hi guys, there is a patch to fix a typo in pacman.c. -- 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/sync1001.py src/pacman/po/it.po)
by Dan McGee 21 Mar '07

21 Mar '07

Date: Wednesday, March 21, 2007 @ 18:15:50 Author: dan Path: /home/cvs-pacman/pacman-lib Added: pactest/tests/sync1001.py (1.1) Modified: src/pacman/po/it.po (1.17 -> 1.18) * Updated Italian translation Giovanni Scafora <linuxmania(a)gmail.com> * Added pactest test for -Se operation James Rosten <seinfeld90(a)gmail.com> ---------------------------+ pactest/tests/sync1001.py | 18 ++++ src/pacman/po/it.po | 184 +++++++++++++++++++++++--------------------- 2 files changed, 118 insertions(+), 84 deletions(-) Index: pacman-lib/pactest/tests/sync1001.py diff -u /dev/null pacman-lib/pactest/tests/sync1001.py:1.1 --- /dev/null Wed Mar 21 18:15:50 2007 +++ pacman-lib/pactest/tests/sync1001.py Wed Mar 21 18:15:50 2007 @@ -0,0 +1,18 @@ +self.description = "Test -Se (ensure specified package is not installed)" + +sp1 = pmpkg("dummy") +sp1.depends = [ "dep1", "dep2" ] +self.addpkg2db("sync", sp1) + +sp2 = pmpkg("dep1") +self.addpkg2db("sync", sp2) + +sp3 = pmpkg("dep2") +self.addpkg2db("sync", sp3) + +self.args = "-Se dummy" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dep1") +self.addrule("PKG_EXIST=dep2") +self.addrule("!PKG_EXIST=dummy") Index: pacman-lib/src/pacman/po/it.po diff -u pacman-lib/src/pacman/po/it.po:1.17 pacman-lib/src/pacman/po/it.po:1.18 --- pacman-lib/src/pacman/po/it.po:1.17 Sun Mar 18 22:45:01 2007 +++ pacman-lib/src/pacman/po/it.po Wed Mar 21 18:15:50 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-03-19 02:42+0100\n" -"PO-Revision-Date: 2007-03-19 03:30+0100\n" +"POT-Creation-Date: 2007-03-21 10:44+0100\n" +"PO-Revision-Date: 2007-03-21 11:40+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" @@ -38,9 +38,8 @@ msgstr "impossibile aggiungere il pacchetto '%s' (%s)" #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73 -#: src/pacman/trans.c:80 src/pacman/trans.c:84 src/pacman/trans.c:94 -#: src/pacman/trans.c:108 src/pacman/trans.c:122 src/pacman/trans.c:134 -#: src/pacman/trans.c:145 +#: src/pacman/trans.c:80 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" @@ -54,22 +53,22 @@ msgid ":: %s: requires %s" msgstr ":: %s: richiede %s" -#: src/pacman/add.c:125 src/pacman/sync.c:645 +#: src/pacman/add.c:125 src/pacman/sync.c:643 #, c-format msgid ":: %s: conflicts with %s" msgstr ":: %s: va in conflitto con %s" -#: src/pacman/add.c:134 src/pacman/sync.c:709 +#: src/pacman/add.c:134 src/pacman/sync.c:707 #, c-format msgid "%s exists in both '%s' and '%s'\n" msgstr "%s è già presente in '%s' e in '%s'\n" -#: src/pacman/add.c:140 src/pacman/sync.c:715 +#: src/pacman/add.c:140 src/pacman/sync.c:713 #, c-format msgid "%s: %s exists in filesystem\n" msgstr "%s: %s è già presente nel filesystem\n" -#: src/pacman/add.c:146 src/pacman/sync.c:721 src/pacman/sync.c:727 +#: src/pacman/add.c:146 src/pacman/sync.c:719 src/pacman/sync.c:725 msgid "" "\n" "errors occurred, no packages were upgraded.\n" @@ -77,18 +76,18 @@ "\n" "si sono verificati degli errori, nessun pacchetto è stato aggiornato.\n" -#: src/pacman/add.c:156 src/pacman/sync.c:652 +#: src/pacman/add.c:156 src/pacman/sync.c:650 #, c-format msgid ":: %.1f MB required, have %.1f MB" msgstr ":: %.1f MB richiesti, spazio a disposizione %.1f MB" -#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:702 +#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700 #, c-format msgid "failed to commit transaction (%s)\n" msgstr "impossibile eseguire l'operazione richiesta (%s)\n" #: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524 -#: src/pacman/sync.c:743 +#: src/pacman/sync.c:741 #, c-format msgid "failed to release transaction (%s)\n" msgstr "impossibile annullare l'operazione richiesta (%s)\n" @@ -211,7 +210,7 @@ #: src/pacman/package.c:89 #, c-format msgid "Build Date : %s %s\n" -msgstr "Creato in data : %s %s\n" +msgstr "Creato il : %s %s\n" #: src/pacman/package.c:90 #, c-format @@ -273,7 +272,7 @@ #: src/pacman/package.c:180 #, c-format msgid "error calculating checksums for %s\n" -msgstr "si è verificato un errore durante il calcolo del checksum di %s\n" +msgstr "si è verificato un errore durante il calcolo dei checksum di %s\n" #: src/pacman/package.c:193 #, c-format @@ -364,7 +363,7 @@ #: src/pacman/pacman.c:140 #, c-format msgid " -d, --nodeps skip dependency checks\n" -msgstr " -d, --nodeps ignora le dipendenze richieste\n" +msgstr " -d, --nodeps ignora i controlli sulle dipendenze\n" #: src/pacman/pacman.c:104 src/pacman/pacman.c:121 src/pacman/pacman.c:142 #, c-format @@ -382,8 +381,7 @@ #, c-format msgid "" " -c, --cascade remove packages and all packages that depend on them\n" -msgstr "" -" -c, --cascade rimuove tutte le dipendenze a cascata\n" +msgstr " -c, --cascade rimuove i pacchetti con tutte le dipendenze\n" #: src/pacman/pacman.c:110 #, c-format @@ -402,7 +400,8 @@ #, c-format msgid "" " -s, --recursive remove dependencies also (that won't break packages)\n" -msgstr " -s, --recursive rimuove anche le dipendenze (non richieste altrove)\n" +msgstr "" +" -s, --recursive rimuove anche le dipendenze (non richieste altrove)\n" #: src/pacman/pacman.c:115 #, c-format @@ -430,8 +429,7 @@ " -e, --orphans list all packages installed as dependencies but no " "longer\n" msgstr "" -" -e, --orphans elenca tutti i pacchetti installati come dipendenze e " -"non\n" +" -e, --orphans elenca i pacchetti installati che non sono dipendenze\n" #: src/pacman/pacman.c:127 #, c-format @@ -482,8 +480,7 @@ " -s, --search search locally-installed packages for matching " "strings\n" msgstr "" -" -s, --search cerca nei pacchetti installati le corrispondenti " -"stringhe\n" +" -s, --search cerca nei pacchetti installati le stringhe corrispondenti\n" #: src/pacman/pacman.c:135 #, c-format @@ -515,7 +512,8 @@ #: src/pacman/pacman.c:145 #, c-format msgid " -l. --list <repo> view a list of packages in a repo\n" -msgstr " -l, --list <repo> visualizza la lista dei pacchetti di un repository\n" +msgstr "" +" -l, --list <repo> visualizza la lista dei pacchetti di un repository\n" #: src/pacman/pacman.c:146 #, c-format @@ -576,7 +574,8 @@ #, c-format msgid "" " --ask <number> pre-specify answers for questions (see manpage)\n" -msgstr " --ask <numero> specifica in anticipo le risposte alle domande\n" +msgstr "" +" --ask <numero> specifica in anticipo le risposte alle domande\n" #: src/pacman/pacman.c:156 #, c-format @@ -588,7 +587,7 @@ #, c-format msgid "" " --noscriptlet do not execute the install scriptlet if there is any\n" -msgstr " --noscriptlet non esegue lo script install\n" +msgstr " --noscriptlet non esegue un eventuale script di install\n" #: src/pacman/pacman.c:158 #, c-format @@ -626,7 +625,7 @@ #: src/pacman/pacman.c:300 #, c-format msgid "'%s' is not a valid debug level" -msgstr "'%s' livello di debug non valido" +msgstr "'%s' non è un livello di debug valido" #: src/pacman/pacman.c:315 #, c-format @@ -641,7 +640,7 @@ #: src/pacman/pacman.c:363 #, c-format msgid "'%s' is not a valid root path\n" -msgstr "'%s' path di root non valido\n" +msgstr "'%s' non è un path di root valido\n" #: src/pacman/pacman.c:390 msgid "only one operation may be used at a time\n" @@ -665,64 +664,78 @@ msgid "failed to parse config (%s)\n" msgstr "impossibile analizzare la configurazione (%s)\n" -#: src/pacman/pacman.c:515 src/pacman/remove.c:128 src/pacman/util.c:324 -msgid "Targets:" -msgstr "Pacchetti:" +#: src/pacman/pacman.c:516 +msgid "Targets :" +msgstr "Pacchetti :" -#: src/pacman/pacman.c:521 +#: src/pacman/pacman.c:522 #, c-format msgid "could not register 'local' database (%s)\n" msgstr "impossibile registrare il database 'locale' (%s)\n" -#: src/pacman/pacman.c:528 +#: src/pacman/pacman.c:529 msgid "no targets specified (use -h for help)\n" msgstr "nessun pacchetto specificato (usare -h per un aiuto)\n" -#: src/pacman/pacman.c:541 +#: src/pacman/pacman.c:542 msgid "no operation specified (use -h for help)\n" msgstr "nessuna operazione specificata (usare -h per un aiuto)\n" -#: src/pacman/query.c:56 +#: src/pacman/query.c:57 msgid "no file was specified for --owns\n" msgstr "nessun file specificato per --owns\n" -#: src/pacman/query.c:74 +#: src/pacman/query.c:62 +#, c-format +msgid "failed to read file '%s': %s" +msgstr "impossibile leggere il file '%s': %s" + +#: src/pacman/query.c:67 +msgid "cannot determine ownership of a directory" +msgstr "impossibile determinare il proprietario di una directory" + +#: src/pacman/query.c:72 +#, c-format +msgid "cannot determine real path for '%s': %s" +msgstr "impossibile determinare la posizione reale di '%s': %s" + +#: src/pacman/query.c:85 #, c-format msgid "%s is owned by %s %s\n" msgstr "%s è contenuto in %s %s\n" -#: src/pacman/query.c:81 +#: src/pacman/query.c:92 #, c-format msgid "No package owns %s\n" msgstr "Nessun pacchetto contiene %s\n" -#: src/pacman/query.c:122 src/pacman/sync.c:453 +#: src/pacman/query.c:133 src/pacman/sync.c:453 msgid "no usable package repositories configured.\n" -msgstr "nessun repository configurato.\n" +msgstr "non è stato configurato nessun repository di pacchetti valido.\n" -#: src/pacman/query.c:128 +#: src/pacman/query.c:139 msgid "Checking for package upgrades..." -msgstr "Controllo dei pacchetti da aggiornare in corso..." +msgstr "Controllo degli aggiornamenti dei pacchetti in corso..." -#: src/pacman/query.c:135 +#: src/pacman/query.c:146 msgid "no upgrades found" msgstr "nessun aggiornamento trovato" -#: src/pacman/query.c:173 +#: src/pacman/query.c:184 #, c-format msgid "group \"%s\" was not found\n" msgstr "gruppo \"%s\" non trovato\n" -#: src/pacman/query.c:184 +#: src/pacman/query.c:195 msgid "no package file was specified for --file\n" -msgstr "nessun file del pacchetto specificato per --file\n" +msgstr "nessun file di pacchetto specificato per --file\n" -#: src/pacman/query.c:188 +#: src/pacman/query.c:199 #, c-format msgid "failed to load package '%s' (%s)\n" msgstr "impossibile caricare il pacchetto '%s' (%s)\n" -#: src/pacman/query.c:225 src/pacman/query.c:257 +#: src/pacman/query.c:236 src/pacman/query.c:268 #, c-format msgid "package \"%s\" not found\n" msgstr "pacchetto \"%s\" non trovato\n" @@ -734,7 +747,7 @@ #: src/pacman/remove.c:63 msgid " Remove whole content? [Y/n] " -msgstr " Rimuovere tutto il contenuto? [Y/n] " +msgstr " Rimuovere l'intero contenuto? [Y/n] " #: src/pacman/remove.c:67 #, c-format @@ -756,6 +769,10 @@ msgid ":: %s is required by %s\n" msgstr ":: %s è richiesto da %s\n" +#: src/pacman/remove.c:128 src/pacman/util.c:324 +msgid "Targets:" +msgstr "Pacchetti:" + #: src/pacman/remove.c:131 msgid "" "\n" @@ -861,7 +878,7 @@ #: 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" +msgstr ":: prima e poi riavviare l'operazione con la versione più recente.\n" #: src/pacman/sync.c:522 msgid ":: Upgrade pacman first? [Y/n] " @@ -879,7 +896,7 @@ #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " -msgstr ":: Installare tutto il contenuto? [Y/n] " +msgstr ":: Installare l'intero contenuto? [Y/n] " #: src/pacman/sync.c:579 #, c-format @@ -891,19 +908,15 @@ msgid "'%s': not found in sync db\n" msgstr "'%s': non trovato nel database\n" -#: src/pacman/sync.c:623 +#: src/pacman/sync.c:621 msgid "requires" msgstr "richiede" -#: src/pacman/sync.c:623 -msgid "is required by" -msgstr "è richiesto da" - -#: src/pacman/sync.c:665 +#: src/pacman/sync.c:663 msgid " local database is up to date\n" msgstr " Il database locale è aggiornato\n" -#: src/pacman/sync.c:674 +#: src/pacman/sync.c:672 msgid "" "\n" "Beginning download...\n" @@ -911,11 +924,11 @@ "\n" "Download in corso...\n" -#: src/pacman/sync.c:678 +#: src/pacman/sync.c:676 msgid "Proceed with download? [Y/n] " msgstr "Procedere con il download? [Y/n] " -#: src/pacman/sync.c:686 +#: src/pacman/sync.c:684 msgid "" "\n" "Beginning upgrade process...\n" @@ -923,7 +936,7 @@ "\n" "Aggiornamento in corso...\n" -#: src/pacman/sync.c:690 +#: src/pacman/sync.c:688 msgid "Proceed with installation? [Y/n] " msgstr "Procedere con l'installazione? [Y/n] " @@ -945,106 +958,106 @@ #: src/pacman/trans.c:69 msgid "looking for inter-conflicts... " -msgstr "ricerca dei conflitti in corso... " +msgstr "ricerca dei conflitti incrociati in corso... " -#: src/pacman/trans.c:89 +#: src/pacman/trans.c:86 #, c-format msgid "installing %s... " msgstr "installazione di %s in corso... " -#: src/pacman/trans.c:96 +#: src/pacman/trans.c:93 #, c-format msgid "installed %s (%s)" msgstr "installato %s (%s)" -#: src/pacman/trans.c:103 +#: src/pacman/trans.c:100 #, c-format msgid "removing %s... " -msgstr "rimozione in corso di %s... " +msgstr "rimozione di %s in corso... " -#: src/pacman/trans.c:110 +#: src/pacman/trans.c:107 #, c-format msgid "removed %s (%s)" msgstr "rimosso %s (%s)" -#: src/pacman/trans.c:117 +#: src/pacman/trans.c:114 #, c-format msgid "upgrading %s... " -msgstr "aggiornamento in corso di %s... " +msgstr "aggiornamento di %s in corso... " -#: src/pacman/trans.c:124 +#: src/pacman/trans.c:121 #, c-format msgid "upgraded %s (%s -> %s)" msgstr "aggiornato %s (%s -> %s)" -#: src/pacman/trans.c:131 +#: src/pacman/trans.c:128 msgid "checking package integrity... " msgstr "controllo dell'integrità dei pacchetti in corso... " -#: src/pacman/trans.c:147 +#: src/pacman/trans.c:144 msgid "failed.\n" msgstr "non riuscito.\n" -#: src/pacman/trans.c:154 +#: src/pacman/trans.c:151 #, c-format msgid ":: Retrieving packages from %s...\n" msgstr ":: Recupero dei pacchetti da %s...\n" -#: src/pacman/trans.c:175 +#: src/pacman/trans.c:172 #, c-format msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] " msgstr ":: %1$s richiede %2$s da IgnorePkg. Installare %2$s? [Y/n] " -#: src/pacman/trans.c:180 +#: src/pacman/trans.c:177 #, c-format msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] " msgstr ":: %s è in IgnorePkg. Installare ugualmente? [Y/n] " -#: src/pacman/trans.c:193 +#: src/pacman/trans.c:190 #, c-format msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " -msgstr ":: %s è in HoldPkg. Rimuovere ugualmente? [Y/n] " +msgstr ":: %s è presente in HoldPkg. Rimuovere ugualmente? [Y/n] " -#: src/pacman/trans.c:206 +#: src/pacman/trans.c:203 #, c-format msgid ":: Replace %s with %s/%s? [Y/n] " msgstr ":: Sostituire %s con %s/%s? [Y/n] " -#: src/pacman/trans.c:221 +#: src/pacman/trans.c:218 #, c-format msgid ":: %s conflicts with %s. Remove %s? [Y/n] " msgstr ":: %s va in conflitto con %s. Rimuovere %s? [Y/n] " -#: src/pacman/trans.c:237 +#: src/pacman/trans.c:234 #, c-format msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " msgstr "" ":: %s-%s: la versione installata è più recente. Aggiornare ugualmente? [Y/n] " -#: src/pacman/trans.c:255 +#: src/pacman/trans.c:252 #, c-format msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] " msgstr "" ":: %s-%s: la versione installata è aggiornata. Aggiornare ugualmente? [Y/n] " -#: src/pacman/trans.c:273 +#: src/pacman/trans.c:270 #, c-format msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] " msgstr ":: L'archivio %s è corrotto. Eliminarlo? [Y/n] " -#: src/pacman/trans.c:329 +#: src/pacman/trans.c:326 msgid "installing" msgstr "installazione in corso di " -#: src/pacman/trans.c:332 +#: src/pacman/trans.c:329 msgid "upgrading" msgstr "aggiornamento in corso di" -#: src/pacman/trans.c:335 +#: src/pacman/trans.c:332 msgid "removing" msgstr "rimozione in corso di" -#: src/pacman/trans.c:338 +#: src/pacman/trans.c:335 msgid "checking for file conflicts" msgstr "controllo dei conflitti in corso" @@ -1080,6 +1093,9 @@ msgid "Total Installed Size: %.2f MB\n" msgstr "Dimensione totale dei pacchetti installati: %.2f MB\n" +#~ msgid "is required by" +#~ msgstr "è richiesto da" + #~ msgid "Installed Size : %ld K\n" #~ msgstr "Dimensione : %ld K\n"

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (server.c)
by Juergen Hoetzel 21 Mar '07

21 Mar '07

Date: Wednesday, March 21, 2007 @ 17:08:08 Author: juergen Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: server.c (1.27 -> 1.28) * dont use XferCommand if retrieving local files, fixes wget error: file:////....: Unsupported scheme. ----------+ server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/server.c diff -u pacman-lib/lib/libalpm/server.c:1.27 pacman-lib/lib/libalpm/server.c:1.28 --- pacman-lib/lib/libalpm/server.c:1.27 Tue Mar 20 23:08:19 2007 +++ pacman-lib/lib/libalpm/server.c Wed Mar 21 17:08:08 2007 @@ -211,7 +211,7 @@ continue; } - if(!handle->xfercommand) { + if(!handle->xfercommand || !strcmp(fileurl->scheme, "file")) { FILE *dlf, *localf = NULL; struct url_stat ust; struct stat st;

1 0

[pacman-dev] repo-add DB entry size
by Dan McGee 21 Mar '07

21 Mar '07

I've noticed that our sync DB entries got a lot bigger with the new repository generation tools. Are we sure we want this? Here is a DB entry produced by repo-add: $ cat custom/pacman-3.0.0-rc2/desc %FILENAME% pacman-3.0.0-rc2-i686.pkg.tar.gz %NAME% pacman %VERSION% 3.0.0-rc2 %DESC% A library-based package manager with dependency support %CSIZE% 791331 %ISIZE% 2014429 %MD5SUM% 263805fff1ce59550f37a22dac468a31 %URL% http://www.archlinux.org/pacman/ %LICENSE% GPL %ARCH% i686 %BUILDDATE% Mon Mar 12 18:05:54 2007 %PACKAGER% Dan McGee <dpmcgee(a)gmail.com> %REPLACES% pacman-rc And a DB entry from pacman 2 tools: $ cat current/pacman-2.9.8-4/desc %NAME% pacman %VERSION% 2.9.8-4 %DESC% A .tar.gz based package manager with dependency support %CSIZE% 488015 %MD5SUM% c6e0ffd2fd0f8e69f9ba0cb9de8fcf64 We have 13 vs. 5 fields in the old. I don't know if this will be a significant slowdown for pacman, but it will definitely be larger DB downloads once you do this to every package in current or extra. -Dan

2 4

[pacman-dev] pacman test-o-rama
by Aaron Griffin 21 Mar '07

21 Mar '07

Hey all, We'd like to move pacman 3 to [testing] Real Soon (TM). But I just want to make sure we cover all the bases. I'm going to invite everyone interested to IRC for a big ol' test-fest. Feel free to join #archlinux-pacman on freenode (it's an open channel, feel free to join whenever you want). I'd like to run through everything tonight and tomorrow, so we can push this on Wed or so. So if you have something you feel is critical, please join up and let myself (phrakture) or dan (toofishes) know and we can get to working on it. Thanks in advance, Aaron

4 13