- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] CVS update of pacman-lib/lib/libalpm (db.c db.h server.h)
by Dan McGee 01 Mar '07

01 Mar '07

Date: Wednesday, February 28, 2007 @ 22:08:41 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: db.c (1.62 -> 1.63) db.h (1.26 -> 1.27) server.h (1.10 -> 1.11) * Fix up _alpm_db_free, remove use of void*. ----------+ db.c | 6 ++---- db.h | 2 +- server.h | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) Index: pacman-lib/lib/libalpm/db.c diff -u pacman-lib/lib/libalpm/db.c:1.62 pacman-lib/lib/libalpm/db.c:1.63 --- pacman-lib/lib/libalpm/db.c:1.62 Mon Feb 26 18:32:08 2007 +++ pacman-lib/lib/libalpm/db.c Wed Feb 28 22:08:41 2007 @@ -78,13 +78,11 @@ return(db); } -void _alpm_db_free(void *data) +void _alpm_db_free(pmdb_t *db) { - pmdb_t *db = data; - ALPM_LOG_FUNC; - FREELISTSERVERS(db->servers); + _FREELIST(db->servers, _alpm_server_free); FREE(db->path); FREE(db); Index: pacman-lib/lib/libalpm/db.h diff -u pacman-lib/lib/libalpm/db.h:1.26 pacman-lib/lib/libalpm/db.h:1.27 --- pacman-lib/lib/libalpm/db.h:1.26 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/db.h Wed Feb 28 22:08:41 2007 @@ -48,7 +48,7 @@ /* db.c, database general calls */ pmdb_t *_alpm_db_new(const char *root, const char *dbpath, const char *treename); -void _alpm_db_free(void *data); +void _alpm_db_free(pmdb_t *db); int _alpm_db_cmp(const void *db1, const void *db2); alpm_list_t *_alpm_db_search(pmdb_t *db, alpm_list_t *needles); pmdb_t *_alpm_db_register(const char *treename, alpm_cb_db_register callback); Index: pacman-lib/lib/libalpm/server.h diff -u pacman-lib/lib/libalpm/server.h:1.10 pacman-lib/lib/libalpm/server.h:1.11 --- pacman-lib/lib/libalpm/server.h:1.10 Fri Feb 9 05:10:49 2007 +++ pacman-lib/lib/libalpm/server.h Wed Feb 28 22:08:41 2007 @@ -28,7 +28,6 @@ #include <download.h> #define FREESERVER(p) do { if(p){_alpm_server_free(p); p = NULL;}} while(0) -#define FREELISTSERVERS(p) _FREELIST(p, _alpm_server_free) /* Servers */ struct __pmserver_t {

1 0

[pacman-dev] RC 2007.02.16
by Aaron Griffin 28 Feb '07

28 Feb '07

Latest and greatest. Not all that many changes here.. -Si works with the repo/package syntax, spacing on the "saving as .pacsave" output is fixed, etc Mostly minor. Test it out: http://archlinux.org/~aaron/pacman/pacman-rc-2007.02.16-1-i686.pkg.tar.gz There is only one pending bug here, it's listed in the bugcatcher here: http://bugs.archlinux.org/task/6316 If anyone can reproduce that, let me know. I'm still trying to track that one down. Thanks guys!

6 19

[pacman-dev] 'replaces' confusion
by Aaron Griffin 28 Feb '07

28 Feb '07

So it appears the backend and pactest are both a little confused about where 'replaces' belongs. If we look at a current repo, 'replaces' is listed in the /desc file: $ cat /var/lib/pacman/current/gawk-3.1.5-3/desc %NAME% gawk %VERSION% 3.1.5-3 %DESC% Gnu version of awk %CSIZE% 552398 %MD5SUM% 4f539bb7ba6bb3328a2891ecf4ad2caf %REPLACES% mawk However, it appears that libalpm actually *writes* this info to the /depends file - replaces info is NOT written to the local DB. Please note that it appears this code is never actually hit. The db_write routine is not currently used when unpacking a remote DB, it is mostly untarred directly. In the future, however, this routine WILL be used to write DB info, so it is important to figure this out now: Where does 'replaces' info belong? I leave the question open, because i have no opinion, but I'd like to do this right - where does it fit best? The /depends file seems more appropriate, as it contains all the "list" info already. Anyone have an opinion?

6 21

[pacman-dev] CVS update of pacman-lib (7 files)
by Dan McGee 28 Feb '07

28 Feb '07

Date: Wednesday, February 28, 2007 @ 11:37:24 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/be_files.c (1.31 -> 1.32) lib/libalpm/package.c (1.78 -> 1.79) pactest/pmdb.py (1.4 -> 1.5) pactest/pmenv.py (1.7 -> 1.8) pactest/pmfile.py (1.3 -> 1.4) pactest/pmrule.py (1.4 -> 1.5) pactest/util.py (1.3 -> 1.4) * Unifying placement of REPLACES in desc file, as pacman2 does. We'll worry about bigger DB changes later, but lets not screw anything up for release. * Removed some weird uses of "not ... ==" usage in pactest- correct me if I'm wrong, but isn't "!=" a lot more clean and concise? * Print description of failed tests in the pactest summary. This could get dirty with a lot of failed tests though, so watch out. ------------------------+ lib/libalpm/be_files.c | 21 ++++++++++----------- lib/libalpm/package.c | 3 ++- pactest/pmdb.py | 25 ++++++++++++++----------- pactest/pmenv.py | 11 ++++++++--- pactest/pmfile.py | 4 ++-- pactest/pmrule.py | 2 +- pactest/util.py | 9 +++++---- 7 files changed, 42 insertions(+), 33 deletions(-) Index: pacman-lib/lib/libalpm/be_files.c diff -u pacman-lib/lib/libalpm/be_files.c:1.31 pacman-lib/lib/libalpm/be_files.c:1.32 --- pacman-lib/lib/libalpm/be_files.c:1.31 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/be_files.c Wed Feb 28 11:37:24 2007 @@ -365,10 +365,6 @@ if(fgets(info->md5sum, sizeof(info->md5sum), fp) == NULL) { goto error; } - /* XXX: these are only here as backwards-compatibility for pacman 2.x - * sync repos.... in pacman3, they have been moved to DEPENDS. - * Remove this when we move to pacman3 repos. - */ } else if(!strcmp(line, "%REPLACES%")) { /* the REPLACES tag is special -- it only appears in sync repositories, * not the local one. */ @@ -434,17 +430,20 @@ while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { info->provides = alpm_list_add(info->provides, strdup(line)); } - } else if(!strcmp(line, "%REPLACES%")) { - /* the REPLACES tag is special -- it only appears in sync repositories, - * not the local one. */ + } + /* TODO: we were going to move these things here, but it should wait. + * A better change would be to figure out how to restructure the DB. */ + /* else if(!strcmp(line, "%REPLACES%")) { + * the REPLACES tag is special -- it only appears in sync repositories, + * not the local one. * while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { info->replaces = alpm_list_add(info->replaces, strdup(line)); - } + } } else if(!strcmp(line, "%FORCE%")) { - /* FORCE tag only appears in sync repositories, - * not the local one. */ + * FORCE tag only appears in sync repositories, + * not the local one. * info->force = 1; - } + } */ } fclose(fp); fp = NULL; Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.78 pacman-lib/lib/libalpm/package.c:1.79 --- pacman-lib/lib/libalpm/package.c:1.78 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/package.c Wed Feb 28 11:37:24 2007 @@ -178,7 +178,8 @@ } /* Parses the package description file for the current package - * + * TODO: this should ALL be in a backend interface (be_files), we should + * be dealing with the abstracted concepts only in this file * Returns: 0 on success, 1 on error * */ Index: pacman-lib/pactest/pmdb.py diff -u pacman-lib/pactest/pmdb.py:1.4 pacman-lib/pactest/pmdb.py:1.5 --- pacman-lib/pactest/pmdb.py:1.4 Mon Feb 26 03:33:48 2007 +++ pacman-lib/pactest/pmdb.py Wed Feb 28 11:37:24 2007 @@ -193,11 +193,12 @@ pkg.conflicts = _getsection(fd) elif line == "%PROVIDES%": pkg.provides = _getsection(fd) - elif line == "%REPLACES%": - pkg.replaces = _getsection(fd) - elif line == "%FORCE%": - fd.readline() - pkg.force = 1 + # TODO this was going to be changed, but isn't anymore + #elif line == "%REPLACES%": + # pkg.replaces = _getsection(fd) + #elif line == "%FORCE%": + # fd.readline() + # pkg.force = 1 fd.close() pkg.checksum["depends"] = getmd5sum(filename) pkg.mtime["depends"] = getmtime(filename) @@ -253,6 +254,8 @@ else: if pkg.replaces: data.append(_mksection("REPLACES", pkg.replaces)) + if pkg.force: + data.append(_mksection("FORCE", "")) if pkg.csize: data.append(_mksection("CSIZE", pkg.csize)) if pkg.md5sum: @@ -293,11 +296,11 @@ data.append(_mksection("CONFLICTS", pkg.conflicts)) if pkg.provides: data.append(_mksection("PROVIDES", pkg.provides)) - if not self.treename == "local": - if pkg.replaces: - data.append(_mksection("REPLACES", pkg.replaces)) - if pkg.force: - data.append(_mksection("FORCE", "")) + #if self.treename != "local": + # if pkg.replaces: + # data.append(_mksection("REPLACES", pkg.replaces)) + # if pkg.force: + # data.append(_mksection("FORCE", "")) if data: data.append("") filename = os.path.join(path, "depends") @@ -354,7 +357,7 @@ and oldpkg.mtime[key] == (0, 0, 0) \ and pkg.mtime[key] == (0, 0, 0): continue - if not oldpkg.mtime[key][1:3] == pkg.mtime[key][1:3]: + if oldpkg.mtime[key][1:3] != pkg.mtime[key][1:3]: modified += 1 return modified Index: pacman-lib/pactest/pmenv.py diff -u pacman-lib/pactest/pmenv.py:1.7 pacman-lib/pactest/pmenv.py:1.8 --- pacman-lib/pactest/pmenv.py:1.7 Tue Feb 27 14:44:45 2007 +++ pacman-lib/pactest/pmenv.py Wed Feb 28 11:37:24 2007 @@ -104,11 +104,16 @@ fail = test.result["fail"] rules = len(test.rules) if fail == 0: - print "[PASSED]", + result = "[PASSED]" else: - print "[FAILED]", + result = "[FAILED]" + print result, print "%s Rules: OK = %2u FAIL = %2u SKIP = %2u" \ - % (test.testname.ljust(32), success, fail, rules - (success + fail)) + % (test.testname.ljust(32), success, fail, \ + rules - (success + fail)) + if fail != 0: + # print test description if test failed + print " ", test.description print "=========="*8 print "Results" Index: pacman-lib/pactest/pmfile.py diff -u pacman-lib/pactest/pmfile.py:1.3 pacman-lib/pactest/pmfile.py:1.4 --- pacman-lib/pactest/pmfile.py:1.3 Mon Feb 26 03:19:02 2007 +++ pacman-lib/pactest/pmfile.py Wed Feb 28 11:37:24 2007 @@ -52,8 +52,8 @@ vprint("\t\told: %s / %s" % (self.checksum, self.mtime)) vprint("\t\tnew: %s / %s" % (checksum, mtime)) - if not self.checksum == checksum \ - or not (self.mtime[1], self.mtime[2]) == (mtime[1], mtime[2]): + if self.checksum != checksum \ + or (self.mtime[1], self.mtime[2]) != (mtime[1], mtime[2]): retval = 1 return retval Index: pacman-lib/pactest/pmrule.py diff -u pacman-lib/pactest/pmrule.py:1.4 pacman-lib/pactest/pmrule.py:1.5 --- pacman-lib/pactest/pmrule.py:1.4 Tue Feb 27 23:00:21 2007 +++ pacman-lib/pactest/pmrule.py Wed Feb 28 11:37:24 2007 @@ -86,7 +86,7 @@ if not value in newpkg.requiredby: success = 0 elif case == "REASON": - if not newpkg.reason == int(value): + if newpkg.reason != int(value): success = 0 elif case == "FILES": if not value in newpkg.files: Index: pacman-lib/pactest/util.py diff -u pacman-lib/pactest/util.py:1.3 pacman-lib/pactest/util.py:1.4 --- pacman-lib/pactest/util.py:1.3 Mon Feb 26 03:19:03 2007 +++ pacman-lib/pactest/util.py Wed Feb 28 11:37:24 2007 @@ -62,7 +62,7 @@ """ filename = "" link = "" - if not name.find(" -> ") == -1: + if name.find(" -> ") != -1: filename, link = name.split(" -> ") elif name[-1] == "*": filename = name.rstrip("*") @@ -80,7 +80,7 @@ link = "" filename = "" - if not name.find(" -> ") == -1: + if name.find(" -> ") != -1: islink = 1 filename, link = name.split(" -> ") elif name[-1] == "*": @@ -181,8 +181,9 @@ # Repositories data.extend(["[%s]\n" \ "server = file://%s\n" \ - % (value.treename, os.path.join(root, SYNCREPO, value.treename)) \ - for key, value in db.iteritems() if not key == "local"]) + % (value.treename, \ + os.path.join(root, SYNCREPO, value.treename)) \ + for key, value in db.iteritems() if key != "local"]) mkfile(os.path.join(root, filename), "\n".join(data))

1 0