March 2007 - Pacman-dev - lists.archlinux.org

[pacman-dev] 2007-03-01 libalpm Italian translation
by Giovanni Scafora 01 Mar '07

01 Mar '07

Hi guys, there is a new patch for libalpm italian translation with new three messages, some fuzzy messages corrected and 'checkdeps' untranslated. Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] 20070228 Italian Translation patch
by Giovanni Scafora 01 Mar '07

01 Mar '07

Hi Dan, there is a new patch for libalpm italian translation with some corrections and improvements. Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

2 2

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

01 Mar '07

Date: Thursday, March 1, 2007 @ 02:08:49 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: deps.c (1.72 -> 1.73) * Comment clarification --------+ deps.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.72 pacman-lib/lib/libalpm/deps.c:1.73 --- pacman-lib/lib/libalpm/deps.c:1.72 Thu Mar 1 02:03:05 2007 +++ pacman-lib/lib/libalpm/deps.c Thu Mar 1 02:08:48 2007 @@ -263,9 +263,10 @@ pmpkg_t *pkg = l->data; if(strcmp(pkg->name, oldpkg->name) == 0) { - /* well, we know this one fails... skip it */ + /* well, we know this one succeeds, but we're removing it... skip it */ continue; } + if(_alpm_depcmp(pkg, &depend)) { _alpm_log(PM_LOG_DEBUG, _("checkdeps: dependency '%s' satisfied by installed package '%s'"), depend.name, pkg->name);

1 0

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

01 Mar '07

Date: Thursday, March 1, 2007 @ 02:03:05 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.120 -> 1.121) alpm_list.c (1.6 -> 1.7) alpm_list.h (1.5 -> 1.6) deps.c (1.71 -> 1.72) provide.c (1.11 -> 1.12) versioncmp.c (1.14 -> 1.15) * Switched some functions to alpm_pkg_get_* usage as I came across them * Added some provision switching hackery. This could probably use some refactoring,.. it solves the following case: pkg1 and pkg2 provide 'foo' and are both installed pkg3 depends on 'foo' and so lists 'pkg1' in the REQUIREDBY db section pkg1 is upgraded and no longer provides 'foo' ** This code ensures that the REQUIREDBY of pkg3 is updated to require pkg2 now instead of pkg1 --------------+ add.c | 30 ++++++++++++++++++++++++ alpm_list.c | 27 +++++++++++++++++++++ alpm_list.h | 1 deps.c | 71 ++++++++++++++++++++++++++++++++++++++++++--------------- provide.c | 2 - versioncmp.c | 2 - 6 files changed, 113 insertions(+), 20 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.120 pacman-lib/lib/libalpm/add.c:1.121 --- pacman-lib/lib/libalpm/add.c:1.120 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/add.c Thu Mar 1 02:03:05 2007 @@ -343,6 +343,7 @@ oldpkg = _alpm_pkg_new(local->name, local->version); if(oldpkg) { oldpkg->backup = alpm_list_strdup(alpm_pkg_get_backup(local)); + oldpkg->provides = alpm_list_strdup(alpm_pkg_get_provides(local)); strncpy(oldpkg->name, local->name, PKG_NAME_LEN); strncpy(oldpkg->version, local->version, PKG_VERSION_LEN); } else { @@ -749,6 +750,35 @@ * looking for packages depending on the package to add */ _alpm_pkg_update_requiredby(newpkg); + /* special case: if our provides list has changed from oldpkg to newpkg AND + * we get here, we need to make sure we find the actual provision that + * still satisfies this case, and update its 'requiredby' field... ugh */ + alpm_list_t *provdiff, *prov; + provdiff = alpm_list_diff(alpm_pkg_get_provides(oldpkg), + alpm_pkg_get_provides(newpkg), + _alpm_str_cmp); + for(prov = provdiff; prov; prov = prov->next) { + const char *provname = prov->data; + _alpm_log(PM_LOG_DEBUG, _("provision '%s' has been removed from package %s (%s => %s)"), + provname, oldpkg->name, oldpkg->version, newpkg->version); + + alpm_list_t *p = _alpm_db_whatprovides(handle->db_local, provname); + if(p) { + /* we now have all the provisions in the local DB for this virtual + * package... seeing as we can't really determine which is the 'correct' + * provision, we'll use the FIRST for now. + * TODO figure out a way to find a "correct" provision */ + pmpkg_t *provpkg = p->data; + _alpm_log(PM_LOG_DEBUG, _("updating '%s' due to provision change (%s)"), provpkg->name, provname); + _alpm_pkg_update_requiredby(provpkg); + if(_alpm_db_write(db, provpkg, INFRQ_DEPENDS)) { + _alpm_log(PM_LOG_ERROR, _("could not update provision '%s' from '%s'"), provname, provpkg->name); + alpm_logaction(_("could not update provision '%s' from '%s'"), provname, provpkg->name); + RET_ERR(PM_ERR_DB_WRITE, -1); + } + } + } + /* make an install date (in UTC) */ time_t t = time(NULL); strncpy(newpkg->installdate, asctime(gmtime(&t)), PKG_DATE_LEN); Index: pacman-lib/lib/libalpm/alpm_list.c diff -u pacman-lib/lib/libalpm/alpm_list.c:1.6 pacman-lib/lib/libalpm/alpm_list.c:1.7 --- pacman-lib/lib/libalpm/alpm_list.c:1.6 Tue Jan 30 02:47:20 2007 +++ pacman-lib/lib/libalpm/alpm_list.c Thu Mar 1 02:03:05 2007 @@ -457,6 +457,33 @@ return(0); } +/** + * Calculate the items in list `lhs` that are not present in list `rhs` + * @note Entries are not duplicated + * @param lhs the first list + * @param rhs the second list + * @param fn the comparisson function + * @return a list containing all items in lhs not present in rhs + */ +alpm_list_t *alpm_list_diff(alpm_list_t *lhs, alpm_list_t *rhs, alpm_list_fn_cmp fn) +{ + alpm_list_t *i, *j, *ret = NULL; + for(i = lhs; i; i = i->next) { + int found = 0; + for(j = rhs; j; j = j->next) { + if(fn(i->data, j->data) == 0) { + found = 1; + break; + } + } + if(!found) { + ret = alpm_list_add(ret, i->data); + } + } + + return(ret); +} + /** @} */ /* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/lib/libalpm/alpm_list.h diff -u pacman-lib/lib/libalpm/alpm_list.h:1.5 pacman-lib/lib/libalpm/alpm_list.h:1.6 --- pacman-lib/lib/libalpm/alpm_list.h:1.5 Fri Feb 16 17:41:51 2007 +++ pacman-lib/lib/libalpm/alpm_list.h Thu Mar 1 02:03:05 2007 @@ -65,6 +65,7 @@ int alpm_list_count(const alpm_list_t *list); int alpm_list_find(alpm_list_t *haystack, const void *needle); int alpm_list_find_str(alpm_list_t *haystack,const char *needle); +alpm_list_t *alpm_list_diff(alpm_list_t *lhs, alpm_list_t *rhs, alpm_list_fn_cmp fn); #endif /* _ALPM_LIST_H */ Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.71 pacman-lib/lib/libalpm/deps.c:1.72 --- pacman-lib/lib/libalpm/deps.c:1.71 Tue Feb 27 23:00:21 2007 +++ pacman-lib/lib/libalpm/deps.c Thu Mar 1 02:03:05 2007 @@ -198,7 +198,7 @@ alpm_list_t *packages) { pmdepend_t depend; - alpm_list_t *i, *j, *k; + alpm_list_t *i, *j, *k, *l; int found = 0; alpm_list_t *baddeps = NULL; pmdepmissing_t *miss = NULL; @@ -214,19 +214,18 @@ * listed in the requiredby field. */ for(i = packages; i; i = i->next) { - pmpkg_t *tp = i->data; + pmpkg_t *newpkg = i->data; pmpkg_t *oldpkg; - if(tp == NULL) { + if(newpkg == NULL) { _alpm_log(PM_LOG_DEBUG, _("null package found in package list")); continue; } - if((oldpkg = _alpm_db_get_pkgfromcache(db, tp->name)) == NULL) { - _alpm_log(PM_LOG_DEBUG, _("cannot find package installed '%s'"), tp->name); + if((oldpkg = _alpm_db_get_pkgfromcache(db, newpkg->name)) == NULL) { + _alpm_log(PM_LOG_DEBUG, _("cannot find package installed '%s'"), newpkg->name); continue; } - _alpm_db_read(db, oldpkg, INFRQ_DEPENDS); - for(j = oldpkg->requiredby; j; j = j->next) { + for(j = alpm_pkg_get_requiredby(oldpkg); j; j = j->next) { pmpkg_t *p; found = 0; if((p = _alpm_db_get_pkgfromcache(db, j->data)) == NULL) { @@ -237,19 +236,55 @@ /* this package also in the upgrade list, so don't worry about it */ continue; } - _alpm_db_read(db, p, INFRQ_DEPENDS); - for(k = p->depends; k; k = k->next) { + for(k = alpm_pkg_get_depends(p); k; k = k->next) { /* don't break any existing dependencies (possible provides) */ _alpm_splitdep(k->data, &depend); - if(_alpm_depcmp(oldpkg, &depend) && !_alpm_depcmp(tp, &depend)) { - _alpm_log(PM_LOG_DEBUG, _("checkdeps: updated '%s' won't satisfy a dependency of '%s'"), - oldpkg->name, p->name); - miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_REQUIRED, depend.mod, - depend.name, depend.version); - if(!_alpm_depmiss_isin(miss, baddeps)) { - baddeps = alpm_list_add(baddeps, miss); - } else { - FREE(miss); + + /* if oldpkg satisfied this dep, and newpkg doesn't */ + if(_alpm_depcmp(oldpkg, &depend) && !_alpm_depcmp(newpkg, &depend)) { + /* we've found a dep that was removed... see if any other package + * still contains/provides the dep */ + int satisfied = 0; + for(l = packages; l; l = l->next) { + pmpkg_t *pkg = l->data; + + if(_alpm_depcmp(pkg, &depend)) { + _alpm_log(PM_LOG_DEBUG, _("checkdeps: dependency '%s' has moved from '%s' to '%s'"), + depend.name, oldpkg->name, pkg->name); + satisfied = 1; + break; + } + } + + if(!satisfied) { + /* worst case... check installed packages to see if anything else + * satisfies this... */ + for(l = _alpm_db_get_pkgcache(db, INFRQ_DEPENDS); l; l = l->next) { + pmpkg_t *pkg = l->data; + + if(strcmp(pkg->name, oldpkg->name) == 0) { + /* well, we know this one fails... skip it */ + continue; + } + if(_alpm_depcmp(pkg, &depend)) { + _alpm_log(PM_LOG_DEBUG, _("checkdeps: dependency '%s' satisfied by installed package '%s'"), + depend.name, pkg->name); + satisfied = 1; + break; + } + } + } + + if(!satisfied) { + _alpm_log(PM_LOG_DEBUG, _("checkdeps: updated '%s' won't satisfy a dependency of '%s'"), + oldpkg->name, p->name); + miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_REQUIRED, depend.mod, + depend.name, depend.version); + if(!_alpm_depmiss_isin(miss, baddeps)) { + baddeps = alpm_list_add(baddeps, miss); + } else { + FREE(miss); + } } } } Index: pacman-lib/lib/libalpm/provide.c diff -u pacman-lib/lib/libalpm/provide.c:1.11 pacman-lib/lib/libalpm/provide.c:1.12 --- pacman-lib/lib/libalpm/provide.c:1.11 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/provide.c Thu Mar 1 02:03:05 2007 @@ -45,7 +45,7 @@ for(lp = _alpm_db_get_pkgcache(db, INFRQ_DEPENDS); lp; lp = lp->next) { pmpkg_t *info = lp->data; - if(alpm_list_find_str(info->provides, package)) { + if(alpm_list_find_str(alpm_pkg_get_provides(info), package)) { pkgs = alpm_list_add(pkgs, info); } } Index: pacman-lib/lib/libalpm/versioncmp.c diff -u pacman-lib/lib/libalpm/versioncmp.c:1.14 pacman-lib/lib/libalpm/versioncmp.c:1.15 --- pacman-lib/lib/libalpm/versioncmp.c:1.14 Sun Feb 18 13:29:29 2007 +++ pacman-lib/lib/libalpm/versioncmp.c Thu Mar 1 02:03:05 2007 @@ -252,7 +252,7 @@ ALPM_LOG_FUNC; if(strcmp(pkg->name, dep->name) == 0 - || alpm_list_find_str(pkg->provides, dep->name)) { + || alpm_list_find_str(alpm_pkg_get_provides(pkg), dep->name)) { if(dep->mod == PM_DEP_MOD_ANY) { equal = 1; } else {

2 1

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

01 Mar '07

Date: Thursday, March 1, 2007 @ 01:54:05 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest/tests Modified: upgrade056.py (1.2 -> 1.3) * REQUIREDBY test was reversed (pkg3 requiredby pkg1, not pkg1 requiredby pkg3) ---------------+ upgrade056.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: pacman-lib/pactest/tests/upgrade056.py diff -u pacman-lib/pactest/tests/upgrade056.py:1.2 pacman-lib/pactest/tests/upgrade056.py:1.3 --- pacman-lib/pactest/tests/upgrade056.py:1.2 Tue Feb 27 23:00:21 2007 +++ pacman-lib/pactest/tests/upgrade056.py Thu Mar 1 01:54:05 2007 @@ -1,4 +1,4 @@ -self.description = "Upgrade a package that removes a provide but another package still does" +self.description = "Upgrade a package that removes a provide but another package still provides it" lp1 = pmpkg("pkg1") lp1.depends = ["imaginary"] @@ -22,5 +22,5 @@ self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_VERSION=pkg2|1.0-2") self.addrule("PKG_EXIST=pkg3") -self.addrule("!PKG_REQUIREDBY=pkg1|pkg2") -self.addrule("PKG_REQUIREDBY=pkg1|pkg3") +self.addrule("!PKG_REQUIREDBY=pkg2|pkg1") +self.addrule("PKG_REQUIREDBY=pkg3|pkg1")

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.c trans.c)
by Aaron Griffin 01 Mar '07

01 Mar '07

Date: Thursday, March 1, 2007 @ 00:42:53 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.79 -> 1.80) trans.c (1.38 -> 1.39) -----------+ package.c | 23 +++++++++++++++++++---- trans.c | 5 ++++- 2 files changed, 23 insertions(+), 5 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.79 pacman-lib/lib/libalpm/package.c:1.80 --- pacman-lib/lib/libalpm/package.c:1.79 Wed Feb 28 11:37:24 2007 +++ pacman-lib/lib/libalpm/package.c Thu Mar 1 00:42:53 2007 @@ -530,7 +530,7 @@ void _alpm_pkg_update_requiredby(pmpkg_t *pkg) { - alpm_list_t *i, *j; + alpm_list_t *i, *j, *k; pmdb_t *localdb = alpm_option_get_localdb(); for(i = _alpm_db_get_pkgcache(localdb, INFRQ_DEPENDS); i; i = i->next) { @@ -543,11 +543,26 @@ if(!j->data) { continue; } - if(_alpm_splitdep(j->data, &dep) == 0 - && strcmp(dep.name, pkg->name) == 0) { - _alpm_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s'"), cachepkg->name, pkg->name); + if(_alpm_splitdep(j->data, &dep) != 0) { + continue; + } + + /* check the actual package itself */ + if(strcmp(dep.name, pkg->name) == 0) { + _alpm_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s'"), + cachepkg->name, pkg->name); pkg->requiredby = alpm_list_add(pkg->requiredby, strdup(cachepkg->name)); } + + /* check for provisions as well */ + for(k = pkg->provides; k; k = k->next) { + const char *provname = k->data; + if(strcmp(dep.name, provname) == 0) { + _alpm_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s' (provides: %s)"), + cachepkg->name, pkg->name, provname); + pkg->requiredby = alpm_list_add(pkg->requiredby, strdup(cachepkg->name)); + } + } } } } Index: pacman-lib/lib/libalpm/trans.c diff -u pacman-lib/lib/libalpm/trans.c:1.38 pacman-lib/lib/libalpm/trans.c:1.39 --- pacman-lib/lib/libalpm/trans.c:1.38 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/trans.c Thu Mar 1 00:42:53 2007 @@ -259,7 +259,10 @@ ASSERT(pkg != NULL, RET_ERR(PM_ERR_PKG_INVALID, -1)); if(pkg->depends) { - _alpm_log(PM_LOG_DEBUG, _("updating dependency packages 'requiredby' fields")); + _alpm_log(PM_LOG_DEBUG, _("updating dependency packages 'requiredby' fields for %s-%s"), + pkg->name, pkg->version); + } else { + _alpm_log(PM_LOG_DEBUG, _("package has no dependencies, no other packages to update")); } localdb = alpm_option_get_localdb();

1 0

[pacman-dev] CVS update of pacman-lib/pactest (pmenv.py tests/upgrade056.py)
by Dan McGee 01 Mar '07

01 Mar '07

Date: Tuesday, February 27, 2007 @ 14:44:45 Author: dan Path: /home/cvs-pacman/pacman-lib/pactest Added: tests/upgrade056.py (1.1) Modified: pmenv.py (1.6 -> 1.7) * Added another test- I believe it is a possible situation and one we need to deal with. Currently, libalpm with AND without Nagy's patch fails it. * Slight spacing update to pmenv.py. ---------------------+ pmenv.py | 2 +- tests/upgrade056.py | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) Index: pacman-lib/pactest/pmenv.py diff -u pacman-lib/pactest/pmenv.py:1.6 pacman-lib/pactest/pmenv.py:1.7 --- pacman-lib/pactest/pmenv.py:1.6 Mon Feb 26 03:19:02 2007 +++ pacman-lib/pactest/pmenv.py Tue Feb 27 14:44:45 2007 @@ -107,7 +107,7 @@ print "[PASSED]", else: print "[FAILED]", - print "%s Rules:OK = %2u FAIL = %2u SKIP = %2u" \ + print "%s Rules: OK = %2u FAIL = %2u SKIP = %2u" \ % (test.testname.ljust(32), success, fail, rules - (success + fail)) print "=========="*8 Index: pacman-lib/pactest/tests/upgrade056.py diff -u /dev/null pacman-lib/pactest/tests/upgrade056.py:1.1 --- /dev/null Tue Feb 27 14:44:45 2007 +++ pacman-lib/pactest/tests/upgrade056.py Tue Feb 27 14:44:45 2007 @@ -0,0 +1,24 @@ +self.description = "Upgrade a package that removes a provide but another package still does" + +lp1 = pmpkg("pkg1") +lp1.depends = ["imaginary"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.provides = ["imaginary"] +lp2.requiredby = [ "pkg1" ] +self.addpkg2db("local", lp2) + +lp3 = pmpkg("pkg3") +lp3.provides = ["imaginary"] +self.addpkg2db("local", lp3) + +p = pmpkg("pkg2", "1.0-2") +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_VERSION=pkg2|1.0-2") +self.addrule("PKG_EXIST=pkg3")

7 19

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

01 Mar '07

Date: Wednesday, February 28, 2007 @ 23:51:33 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: add.c (1.32 -> 1.33) * Just a note for future reference -------+ add.c | 4 ++++ 1 file changed, 4 insertions(+) Index: pacman-lib/src/pacman/add.c diff -u pacman-lib/src/pacman/add.c:1.32 pacman-lib/src/pacman/add.c:1.33 --- pacman-lib/src/pacman/add.c:1.32 Fri Feb 23 02:50:35 2007 +++ pacman-lib/src/pacman/add.c Wed Feb 28 23:51:33 2007 @@ -94,6 +94,10 @@ case PM_ERR_UNSATISFIED_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); + + /* TODO indicate if the error was a virtual package or not: + * :: %s: requires %s, provided by %s + */ MSG(NL, _(":: %s: requires %s"), alpm_dep_get_target(miss), alpm_dep_get_name(miss)); switch(alpm_dep_get_mod(miss)) {

1 0

[pacman-dev] CVS update of pacman-lib (lib/libalpm/po/it.po src/pacman/package.c)
by Dan McGee 01 Mar '07

01 Mar '07

Date: Wednesday, February 28, 2007 @ 23:51:24 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/po/it.po (1.10 -> 1.11) src/pacman/package.c (1.31 -> 1.32) * Updated Italian translation Giovanni Scafora <linuxmania(a)gmail.com> * Fixed FS #6442 - don't list directories in -Ql output. ----------------------+ lib/libalpm/po/it.po | 180 ++++++++++++++++++++++++------------------------- src/pacman/package.c | 15 +++- 2 files changed, 102 insertions(+), 93 deletions(-) Index: pacman-lib/lib/libalpm/po/it.po diff -u pacman-lib/lib/libalpm/po/it.po:1.10 pacman-lib/lib/libalpm/po/it.po:1.11 --- pacman-lib/lib/libalpm/po/it.po:1.10 Sat Feb 24 15:25:45 2007 +++ pacman-lib/lib/libalpm/po/it.po Wed Feb 28 23:51:24 2007 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libalpm VERSION\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-02-24 11:35+0100\n" +"POT-Creation-Date: 2007-02-28 17:26+0100\n" "PO-Revision-Date: 2007-02-24 12:00+0100\n" "Last-Translator: Giovanni Scafora <linuxmania(a)gmail.com>\n" "Language-Team: Arch Linux Italian Team <linuxmania(a)gmail.com>\n" @@ -17,261 +17,256 @@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bitPlural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/libalpm/add.c:95 -#, c-format -msgid "could not parse token %s" -msgstr "impossibile analizzare il simbolo %s" - -#: lib/libalpm/add.c:129 +#: lib/libalpm/add.c:75 #, c-format msgid "loading target '%s'" msgstr "caricamento del pacchetto '%s' in corso" -#: lib/libalpm/add.c:174 +#: lib/libalpm/add.c:120 #, c-format msgid "replacing older version %s-%s by %s in target list" msgstr "sostituzione in corso della vecchia versione %s-%s con %s" -#: lib/libalpm/add.c:183 +#: lib/libalpm/add.c:129 #, c-format msgid "newer version %s-%s is in the target list -- skipping" msgstr "è presente una versione più recente di %s-%s -- verrà ignorata" -#: lib/libalpm/add.c:190 +#: lib/libalpm/add.c:136 #, c-format msgid "reading '%s' metadata" msgstr "lettura dei metadata di '%s' in corso" -#: lib/libalpm/add.c:243 lib/libalpm/remove.c:110 +#: lib/libalpm/add.c:189 lib/libalpm/remove.c:110 msgid "looking for unsatisfied dependencies" msgstr "ricerca delle dipendenze non soddisfatte" -#: lib/libalpm/add.c:255 lib/libalpm/sync.c:484 +#: lib/libalpm/add.c:201 lib/libalpm/sync.c:484 msgid "looking for conflicts" msgstr "ricerca dei conflitti in corso" -#: lib/libalpm/add.c:260 +#: lib/libalpm/add.c:206 msgid "replacing packages with -A and -U is not supported yet" msgstr "la sostituzione dei pacchetti con -A e -U non è ancora supportata" -#: lib/libalpm/add.c:261 +#: lib/libalpm/add.c:207 #, c-format msgid "please remove '%s' first, using -Rd" msgstr "Si consiglia di rimuovere prima '%s', usando -Rd" -#: lib/libalpm/add.c:302 lib/libalpm/remove.c:146 +#: lib/libalpm/add.c:248 lib/libalpm/remove.c:146 msgid "sorting by dependencies" msgstr "ordinamento per dipendenze in corso" -#: lib/libalpm/add.c:314 +#: lib/libalpm/add.c:260 msgid "cleaning up" msgstr "pulizia in corso" -#: lib/libalpm/add.c:329 +#: lib/libalpm/add.c:275 msgid "looking for file conflicts" msgstr "ricerca dei conflitti tra file in corso" -#: lib/libalpm/add.c:394 +#: lib/libalpm/add.c:340 #, c-format msgid "upgrading package %s-%s" msgstr "aggiornamento del pacchetto %s-%s in corso" -#: lib/libalpm/add.c:417 +#: lib/libalpm/add.c:363 #, c-format msgid "adding package %s-%s" msgstr "inclusione del pacchetto %s-%s in corso" -#: lib/libalpm/add.c:430 +#: lib/libalpm/add.c:376 #, c-format msgid "removing old package first (%s-%s)" msgstr "rimozione del vecchio pacchetto (%s-%s) in corso" -#: lib/libalpm/add.c:457 +#: lib/libalpm/add.c:403 #, c-format msgid "adding %s to the NoUpgrade array temporarilly" msgstr "aggiunta in corso di %s nell'array temporaneo NoUpgrade" -#: lib/libalpm/add.c:475 +#: lib/libalpm/add.c:421 msgid "extracting files" msgstr "estrazione dei file in corso" -#: lib/libalpm/add.c:490 lib/libalpm/util.c:461 +#: lib/libalpm/add.c:436 lib/libalpm/util.c:461 msgid "could not get current working directory" msgstr "impossibile utilizzare la directory corrente" -#: lib/libalpm/add.c:546 +#: lib/libalpm/add.c:492 #, c-format msgid "%s is in NoExtract, skipping extraction" msgstr "%s è in NoExtract, estrazione ignorata" -#: lib/libalpm/add.c:547 +#: lib/libalpm/add.c:493 #, c-format msgid "notice: %s is in NoExtract -- skipping extraction" msgstr "avviso: %s è in NoExtract -- estrazione ignorata" -#: lib/libalpm/add.c:554 +#: lib/libalpm/add.c:500 #, c-format msgid "%s is in trans->skip_add, skipping extraction" msgstr "%s è in trans->skip_add, estrazione ignorata" -#: lib/libalpm/add.c:600 lib/libalpm/add.c:601 lib/libalpm/add.c:750 +#: lib/libalpm/add.c:546 lib/libalpm/add.c:547 lib/libalpm/add.c:696 #, c-format msgid "could not extract %s (%s)" msgstr "impossibile estrarre %s (%s)" -#: lib/libalpm/add.c:644 +#: lib/libalpm/add.c:590 #, c-format msgid "checking md5 hashes for %s" msgstr "controllo dell'hash md5 di %s" -#: lib/libalpm/add.c:646 +#: lib/libalpm/add.c:592 #, c-format msgid "checking sha1 hashes for %s" msgstr "controllo dell'hash sha1 di %s" -#: lib/libalpm/add.c:648 +#: lib/libalpm/add.c:594 #, c-format msgid "current: %s" msgstr "attuale: %s" -#: lib/libalpm/add.c:649 +#: lib/libalpm/add.c:595 #, c-format msgid "new: %s" msgstr "nuovo: %s" -#: lib/libalpm/add.c:650 +#: lib/libalpm/add.c:596 #, c-format msgid "original: %s" msgstr "originale: %s" -#: lib/libalpm/add.c:662 +#: lib/libalpm/add.c:608 #, c-format msgid "could not rename %s (%s)" msgstr "impossibile rinominare %s (%s)" -#: lib/libalpm/add.c:663 +#: lib/libalpm/add.c:609 #, c-format msgid "error: could not rename %s (%s)" msgstr "errore: impossibile rinominare %s (%s)" -#: lib/libalpm/add.c:669 lib/libalpm/add.c:688 +#: lib/libalpm/add.c:615 lib/libalpm/add.c:634 #, c-format msgid "could not copy tempfile to %s (%s)" msgstr "impossibile copiare il file temporaneo in %s (%s)" -#: lib/libalpm/add.c:670 +#: lib/libalpm/add.c:616 #, c-format msgid "error: could not copy tempfile to %s (%s)" msgstr "errore: impossibile copiare il file temporaneo in %s (%s)" -#: lib/libalpm/add.c:674 +#: lib/libalpm/add.c:620 #, c-format msgid "%s saved as %s.pacorig" msgstr "%s salvato come %s.pacorig" -#: lib/libalpm/add.c:675 +#: lib/libalpm/add.c:621 #, c-format msgid "warning: %s saved as %s" msgstr "attenzione: %s salvato come %s" -#: lib/libalpm/add.c:685 +#: lib/libalpm/add.c:631 #, c-format msgid "action: installing new file: %s" msgstr "azione: installazione del nuovo file %s in corso" -#: lib/libalpm/add.c:695 lib/libalpm/add.c:701 lib/libalpm/add.c:706 +#: lib/libalpm/add.c:641 lib/libalpm/add.c:647 lib/libalpm/add.c:652 msgid "action: leaving existing file in place" msgstr "azione: il file non è stato spostato" -#: lib/libalpm/add.c:709 +#: lib/libalpm/add.c:655 msgid "action: keeping current file and installing new one with .pacnew ending" msgstr "" "azione: il file attuale non è stato spostato e sarà installato un nuovo file " "con il suffisso .pacnew" -#: lib/libalpm/add.c:712 +#: lib/libalpm/add.c:658 #, c-format msgid "could not install %s as %s: %s" msgstr "impossibile installare %s come %s: %s" -#: lib/libalpm/add.c:713 +#: lib/libalpm/add.c:659 #, c-format msgid "error: could not install %s as %s: %s" msgstr "errore: impossibile installare %s come %s: %s" -#: lib/libalpm/add.c:715 +#: lib/libalpm/add.c:661 #, c-format msgid "%s installed as %s" msgstr "%s installato come %s" -#: lib/libalpm/add.c:716 +#: lib/libalpm/add.c:662 #, c-format msgid "warning: %s installed as %s" msgstr "attenzione: %s installato come %s" -#: lib/libalpm/add.c:730 +#: lib/libalpm/add.c:676 #, c-format msgid "%s is in NoUpgrade -- skipping" msgstr "%s è in NoUpgrade -- verrà ignorato" -#: lib/libalpm/add.c:731 +#: lib/libalpm/add.c:677 #, c-format msgid "extracting %s as %s.pacnew" msgstr "estrazione di %s come %s.pacnew" -#: lib/libalpm/add.c:732 +#: lib/libalpm/add.c:678 #, c-format msgid "warning: extracting %s as %s.pacnew" msgstr "attenzione: estrazione in corso di %s come %s.pacnew" -#: lib/libalpm/add.c:735 +#: lib/libalpm/add.c:681 #, c-format msgid "extracting %s" msgstr "estrazione di %s in corso" -#: lib/libalpm/add.c:751 +#: lib/libalpm/add.c:697 #, c-format msgid "error: could not extract %s (%s)" msgstr "errore: impossibile estrarre %s (%s)" -#: lib/libalpm/add.c:763 +#: lib/libalpm/add.c:709 #, c-format msgid "appending backup entry for %s" msgstr "aggiunta in corso della voce di backup per %s" -#: lib/libalpm/add.c:795 lib/libalpm/add.c:797 +#: lib/libalpm/add.c:741 lib/libalpm/add.c:743 #, c-format msgid "errors occurred while %s %s" msgstr "si sono verificati degli errori durante %s %s" -#: lib/libalpm/add.c:796 lib/libalpm/add.c:798 +#: lib/libalpm/add.c:742 lib/libalpm/add.c:744 msgid "upgrading" msgstr "aggiornamento in corso" -#: lib/libalpm/add.c:796 lib/libalpm/add.c:798 +#: lib/libalpm/add.c:742 lib/libalpm/add.c:744 msgid "installing" msgstr "installazione in corso" -#: lib/libalpm/add.c:812 lib/libalpm/remove.c:321 +#: lib/libalpm/add.c:758 lib/libalpm/remove.c:321 msgid "updating database" msgstr "aggiornamento del database in corso" -#: lib/libalpm/add.c:813 +#: lib/libalpm/add.c:759 #, c-format msgid "adding database entry '%s'" msgstr "inclusione della voce '%s' nel database" -#: lib/libalpm/add.c:816 lib/libalpm/add.c:818 +#: lib/libalpm/add.c:762 lib/libalpm/add.c:764 #, c-format msgid "could not update database entry %s-%s" msgstr "impossibile aggiornare la voce %s-%s nel database" -#: lib/libalpm/add.c:824 +#: lib/libalpm/add.c:770 #, c-format msgid "could not add entry '%s' in cache" msgstr "impossible includere la voce '%s' nella cache" -#: lib/libalpm/add.c:852 lib/libalpm/remove.c:341 lib/libalpm/sync.c:1054 +#: lib/libalpm/add.c:798 lib/libalpm/remove.c:341 lib/libalpm/sync.c:1054 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "esecuzione in corso di \"ldconfig -r %s\"" @@ -296,8 +291,8 @@ msgid "" "adding new server to database '%s': protocol '%s', server '%s', path '%s'" msgstr "" -"inclusione di un nuovo server nel database '%s': protocollo '%s', server " -"'%s', path '%s'" +"inclusione di un nuovo server nel database '%s': protocollo '%s', server '%" +"s', path '%s'" #: lib/libalpm/alpm.c:233 #, c-format @@ -620,8 +615,8 @@ msgid "db vs targs: found %s as a conflict for %s" msgstr "db vs targs: trovato %s come conflitto per %s" -#: 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/conflict.c:296 lib/libalpm/deps.c:57 lib/libalpm/deps.c:587 +#: lib/libalpm/deps.c:627 lib/libalpm/group.c:43 lib/libalpm/handle.c:49 #: lib/libalpm/package.c:80 lib/libalpm/sync.c:65 lib/libalpm/sync.c:615 #: lib/libalpm/sync.c:631 lib/libalpm/sync.c:727 lib/libalpm/trans.c:52 #: lib/libalpm/util.c:607 lib/libalpm/util.c:614 @@ -634,30 +629,30 @@ msgid "malloc failed: could not allocate %d bytes" msgstr "malloc failed: impossibile allocare %d byte" -#: lib/libalpm/db.c:163 +#: lib/libalpm/db.c:167 msgid "attempt to re-register the 'local' DB" msgstr "tentativo in corso di registrare di nuovo il database 'locale'" -#: lib/libalpm/db.c:171 +#: lib/libalpm/db.c:175 #, c-format msgid "attempt to re-register the '%s' database, using existing" msgstr "" "tentativo in corso di registrare di nuovo il database '%s', usando quello " "esistente" -#: lib/libalpm/db.c:177 +#: lib/libalpm/db.c:181 #, c-format msgid "registering database '%s'" msgstr "registrazione del database '%s'" -#: lib/libalpm/db.c:182 +#: lib/libalpm/db.c:186 #, c-format msgid "database directory '%s' does not exist -- try creating it" msgstr "" "la directory del database '%s' non esiste -- verrà fatto un tentativo per " "crearla" -#: lib/libalpm/db.c:193 +#: lib/libalpm/db.c:197 #, c-format msgid "opening database '%s'" msgstr "apertura del database '%s' in corso" @@ -674,55 +669,60 @@ msgid "sorting dependencies finished" msgstr "ordinamento delle dipendenze terminato" -#: lib/libalpm/deps.c:218 lib/libalpm/deps.c:275 +#: lib/libalpm/deps.c:220 lib/libalpm/deps.c:264 msgid "null package found in package list" msgstr "nessun pacchetto trovato" -#: lib/libalpm/deps.c:223 +#: lib/libalpm/deps.c:225 #, c-format msgid "cannot find package installed '%s'" msgstr "impossibile trovare il pacchetto installato '%s'" -#: lib/libalpm/deps.c:257 lib/libalpm/deps.c:378 +#: lib/libalpm/deps.c:245 #, c-format -msgid "checkdeps: found %s as required by %s" -msgstr "checkdeps: trovato %s come richiesto da %s" +msgid "checkdeps: updated '%s' won't satisfy a dependency of '%s'" +msgstr "controllo delle dipendenze: il pacchetto aggiornato di '%s' non soddisfa una dipendenza di '%s'" -#: lib/libalpm/deps.c:283 +#: lib/libalpm/deps.c:272 #, c-format msgid "no dependencies for target '%s'" msgstr "nessuna dipendenza richiesta dal pacchetto '%s'" -#: lib/libalpm/deps.c:329 +#: lib/libalpm/deps.c:318 #, c-format msgid "missing dependency '%s' for package '%s'" msgstr "manca la dipendenza '%s' richiesta dal pacchetto '%s'" -#: lib/libalpm/deps.c:452 +#: lib/libalpm/deps.c:367 +#, c-format +msgid "checkdeps: found %s as required by %s" +msgstr "controllo delle dipendenze: trovato %s come richiesto da %s" + +#: lib/libalpm/deps.c:441 #, c-format msgid "excluding %s -- explicitly installed" msgstr "esclusione di %s -- installato esplicitamente" -#: lib/libalpm/deps.c:499 +#: lib/libalpm/deps.c:488 #, c-format msgid "cannot find package \"%s\" or anything that provides it!" msgstr "impossibile trovare il pacchetto \"%s\" o qualcosa che lo fornisca!" -#: lib/libalpm/deps.c:508 lib/libalpm/deps.c:520 +#: lib/libalpm/deps.c:497 lib/libalpm/deps.c:509 #, c-format msgid "adding '%s' to the targets" msgstr "inclusione in corso di '%s' nei pacchetti" -#: lib/libalpm/deps.c:551 +#: lib/libalpm/deps.c:540 msgid "started resolving dependencies" msgstr "avvio risoluzione delle dipendenze" -#: lib/libalpm/deps.c:569 +#: lib/libalpm/deps.c:558 #, c-format msgid "%s provides dependency %s -- skipping" msgstr "%s fornisce la dipendenza %s -- verrà ignorato" -#: lib/libalpm/deps.c:594 +#: lib/libalpm/deps.c:583 #, c-format msgid "" "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" @@ -730,27 +730,27 @@ "impossibile risolvere le dipendenze per \"%s\" (\"%s\" non è presente nella " "lista dei pacchetti)" -#: lib/libalpm/deps.c:611 +#: lib/libalpm/deps.c:600 #, c-format msgid "dependency %s is already in the target list -- skipping" msgstr "la dipendenza %s è già nella lista dei pacchetti -- verrà ignorata" -#: lib/libalpm/deps.c:631 +#: lib/libalpm/deps.c:620 #, c-format msgid "pulling dependency %s (needed by %s)" msgstr "aggiunta la dipendenza %s (richiesta da %s)" -#: lib/libalpm/deps.c:635 +#: lib/libalpm/deps.c:624 #, c-format msgid "cannot resolve dependencies for \"%s\"" msgstr "impossibile risolvere le dipendenze per \"%s\"" -#: lib/libalpm/deps.c:651 +#: lib/libalpm/deps.c:640 #, c-format msgid "dependency cycle detected: %s" msgstr "individuato un possibile ciclo di dipendenze: %s" -#: lib/libalpm/deps.c:655 +#: lib/libalpm/deps.c:644 msgid "finished resolving dependencies" msgstr "risoluzione delle dipendenze terminata" @@ -1036,7 +1036,7 @@ msgid "missing package filelist in %s, generating one" msgstr "manca il filelist nel pacchetto %s, creazione in corso" -#: lib/libalpm/package.c:546 +#: lib/libalpm/package.c:547 #, c-format msgid "adding '%s' in requiredby field for '%s'" msgstr "inclusione di '%s' nel campo 'richiesto da' di '%s'" @@ -1448,6 +1448,9 @@ msgid "depcmp: %s-%s %s %s => %s" msgstr "depcmp: %s-%s %s %s => %s" +#~ msgid "could not parse token %s" +#~ msgstr "impossibile analizzare il simbolo %s" + #~ msgid "compare versions for %s: %s vs %s, result=%d" #~ msgstr "confronto delle versioni di %s: %s vs %s, risultato=%d" @@ -1457,9 +1460,6 @@ #~ msgid "db scan found package: %s" #~ msgstr "trovato il pacchetto: %s" -#~ msgid "checkdeps: found %s as a dependency for %s" -#~ msgstr "checkdeps: trovato %s come dipendenza di %s" - #~ msgid "dep is NULL!" #~ msgstr "dep è NULL!" Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.31 pacman-lib/src/pacman/package.c:1.32 --- pacman-lib/src/pacman/package.c:1.31 Mon Feb 19 21:14:28 2007 +++ pacman-lib/src/pacman/package.c Wed Feb 28 23:51:24 2007 @@ -208,15 +208,24 @@ */ void dump_pkg_files(pmpkg_t *pkg) { - const char *pkgname; + const char *pkgname, *root, *filestr; alpm_list_t *i, *pkgfiles; + struct stat buf; + char path[PATH_MAX]; pkgname = alpm_pkg_get_name(pkg); pkgfiles = alpm_pkg_get_files(pkg); + root = alpm_option_get_root(); for(i = pkgfiles; i; i = alpm_list_next(i)) { - fprintf(stdout, "%s %s%s\n", pkgname, alpm_option_get_root(), - (char *)alpm_list_getdata(i)); + filestr = (char*)alpm_list_getdata(i); + /* build a path so we can stat the filename */ + snprintf(path, PATH_MAX-1, "%s%s", root, filestr); + if(!stat(path, &buf) && S_ISDIR(buf.st_mode)) { + /* if we stat it and it is a dir, don't print */ + } else { + fprintf(stdout, "%s %s\n", pkgname, path); + } } fflush(stdout);

1 0

[pacman-dev] CVS update of pacman-lib/pactest/tests (sync895.py sync896.py)
by Dan McGee 01 Mar '07

01 Mar '07

Date: Wednesday, February 28, 2007 @ 22:27:53 Author: dan Path: /home/cvs-pacman/pacman-lib/pactest/tests Modified: sync895.py (1.1 -> 1.2) sync896.py (1.1 -> 1.2) * Silly mistake on making sync895 and sync896- I didn't create the field requiredby for 'already installed' packages, so the test didn't work properly. Once these errors were fixed, both tests pass fine. ------------+ sync895.py | 2 ++ sync896.py | 2 ++ 2 files changed, 4 insertions(+) Index: pacman-lib/pactest/tests/sync895.py diff -u pacman-lib/pactest/tests/sync895.py:1.1 pacman-lib/pactest/tests/sync895.py:1.2 --- pacman-lib/pactest/tests/sync895.py:1.1 Tue Feb 27 15:49:23 2007 +++ pacman-lib/pactest/tests/sync895.py Wed Feb 28 22:27:53 2007 @@ -6,6 +6,7 @@ lp1 = pmpkg("pkg1") lp1.provides = ["foo"] +lp1.requiredby = ["pkg2"] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") @@ -18,3 +19,4 @@ self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") self.addrule("!PKG_EXIST=pkg3") +self.addrule("PKG_REQUIREDBY=pkg1|pkg2") Index: pacman-lib/pactest/tests/sync896.py diff -u pacman-lib/pactest/tests/sync896.py:1.1 pacman-lib/pactest/tests/sync896.py:1.2 --- pacman-lib/pactest/tests/sync896.py:1.1 Tue Feb 27 15:49:24 2007 +++ pacman-lib/pactest/tests/sync896.py Wed Feb 28 22:27:53 2007 @@ -7,6 +7,7 @@ lp1 = pmpkg("pkg1") lp1.provides = ["foo"] +lp1.requiredby = ["pkg2"] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") @@ -19,3 +20,4 @@ self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") self.addrule("PKG_EXIST=pkg3") +self.addrule("PKG_REQUIREDBY=pkg3|pkg2")

1 0