diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | lib/misc.c | 52 | ||||
| -rw-r--r-- | macros.in | 4 | ||||
| -rw-r--r-- | po/cs.po | 44 | ||||
| -rw-r--r-- | po/da.po | 44 | ||||
| -rw-r--r-- | po/de.po | 44 | ||||
| -rw-r--r-- | po/fi.po | 44 | ||||
| -rw-r--r-- | po/fr.po | 44 | ||||
| -rw-r--r-- | po/gl.po | 44 | ||||
| -rw-r--r-- | po/is.po | 44 | ||||
| -rw-r--r-- | po/ja.po | 44 | ||||
| -rw-r--r-- | po/ko.po | 44 | ||||
| -rw-r--r-- | po/no.po | 44 | ||||
| -rw-r--r-- | po/pl.po | 44 | ||||
| -rw-r--r-- | po/pt.po | 44 | ||||
| -rw-r--r-- | po/pt_BR.po | 44 | ||||
| -rw-r--r-- | po/ro.po | 44 | ||||
| -rw-r--r-- | po/rpm.pot | 44 | ||||
| -rw-r--r-- | po/ru.po | 44 | ||||
| -rw-r--r-- | po/sk.po | 44 | ||||
| -rw-r--r-- | po/sl.po | 46 | ||||
| -rw-r--r-- | po/sr.po | 44 | ||||
| -rw-r--r-- | po/sv.po | 44 | ||||
| -rw-r--r-- | po/tr.po | 44 | ||||
| -rw-r--r-- | rpm.spec.in | 9 | ||||
| -rw-r--r-- | rpmdb/db3.c | 5 | ||||
| -rw-r--r-- | rpmdb/rpmdb.c | 9 | ||||
| -rw-r--r-- | rpmio/rpmio.c | 48 | ||||
| -rw-r--r-- | rpmio/rpmio.h | 12 |
29 files changed, 543 insertions, 525 deletions
@@ -234,6 +234,9 @@ - python: argument to ts.addErase (if integer) deletes that instance. - python: rpmmi methods to return this instance, and number of members. - supply transitive closure for CLI packages from rpmdb-redhat database. + - fix: rebuilddb stat'ed target, not source, for rename sanity. + - create /var/lib/rpm if non-existent in, say, a chroot. + - erased packages are now repackaged into /var/spool/repackage. 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/lib/misc.c b/lib/misc.c index c879fea90..e49dbfc6a 100644 --- a/lib/misc.c +++ b/lib/misc.c @@ -121,56 +121,6 @@ int dosetenv(const char * name, const char * value, int overwrite) return putenv(a); } -static int rpmMkpath(const char * path, mode_t mode, uid_t uid, gid_t gid) - /*@globals fileSystem, internalState @*/ - /*@modifies fileSystem, internalState @*/ -{ - char * d, * de; - int created = 0; - int rc; - - if (path == NULL) - return -1; - d = alloca(strlen(path)+2); - de = stpcpy(d, path); - de[1] = '\0'; - for (de = d; *de != '\0'; de++) { - struct stat st; - char savec; - - while (*de && *de != '/') de++; - savec = de[1]; - de[1] = '\0'; - - rc = stat(d, &st); - if (rc) { - switch(errno) { - default: - return errno; - /*@notreached@*/ /*@switchbreak@*/ break; - case ENOENT: - /*@switchbreak@*/ break; - } - rc = mkdir(d, mode); - if (rc) - return errno; - created = 1; - if (!(uid == (uid_t) -1 && gid == (gid_t) -1)) { - rc = chown(d, uid, gid); - if (rc) - return errno; - } - } else if (!S_ISDIR(st.st_mode)) { - return ENOTDIR; - } - de[1] = savec; - } - rc = 0; - if (created) - rpmMessage(RPMMESS_WARNING, "created %%_tmppath directory %s\n", path); - return rc; -} - int makeTempFile(const char * prefix, const char ** fnptr, FD_t * fdptr) { const char * tpmacro = "%{?_tmppath:%{_tmppath}}%{!?_tmppath:/var/tmp}"; @@ -190,7 +140,7 @@ int makeTempFile(const char * prefix, const char ** fnptr, FD_t * fdptr) if (!_initialized) { _initialized = 1; tempfn = rpmGenPath(prefix, tpmacro, NULL); - if (rpmMkpath(tempfn, 0755, (uid_t) -1, (gid_t) -1)) + if (rpmioMkpath(tempfn, 0755, (uid_t) -1, (gid_t) -1)) goto errxit; } /*@=branchstate@*/ @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: /usr/lib/rpm/macros # \verbatim # -# $Id: macros.in,v 1.119 2002/08/13 16:36:45 jbj Exp $ +# $Id: macros.in,v 1.120 2002/08/13 20:40:32 jbj Exp $ # # This is a global RPM configuration file. All changes made here will # be lost when the rpm package is upgraded. Any per-system configuration @@ -553,7 +553,7 @@ # The directory in which erased packages will be saved when using # the --repackage option. -%_repackage_dir /var/spool/up2date +%_repackage_dir /var/spool/repackage # A path (i.e. URL) prefix that is pre-pended to %{_repackage_dir}. %_repackage_root %{nil} @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -1550,7 +1550,7 @@ msgstr "nemohu vytvoøit %s: %s\n" msgid "cannot write to %%%s %s\n" msgstr "nemohu zapsat do %%%s %s\n" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, c-format msgid "error creating temporary file %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" @@ -3081,26 +3081,26 @@ msgstr "" msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 #, fuzzy msgid "shared" msgstr "sdílen v síti " -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -3312,74 +3312,74 @@ msgstr "" msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "znovu vytvoøit databázi z existující databáze" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Nelze pøejmenovat %s na %s: %m\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -1548,7 +1548,7 @@ msgstr "kan ikke oprette %s: %s\n" msgid "cannot write to %%%s %s\n" msgstr "kunne ikke skrive til %s\n" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, c-format msgid "error creating temporary file %s\n" msgstr "fejl ved oprettelse af midlertidig fil %s\n" @@ -3093,25 +3093,25 @@ msgstr "lukkede db-indeks %s/%s\n" msgid "verified db index %s/%s\n" msgstr "lukkede db-indeks %s/%s\n" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "åbner db-indeks %s/%s %s mode=0x%x\n" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kan ikke opnå %s lås på %s/%s\n" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "eksklusiv" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "delt" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "låste db-index %s/%s\n" @@ -3326,76 +3326,76 @@ msgstr "tilføjer %d indgange til '%s'-indekset.\n" msgid "error(%d) storing record %s into %s\n" msgstr "fejl(%d) ved gemning af post %s i %s\n" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "fjerner %s efter vellykket genopbygning af db3.\n" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "der ikke sat nogen dbpath" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, c-format msgid "rebuilding database %s into %s\n" msgstr "genopbygger database %s over i %s\n" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, c-format msgid "temporary database %s already exists\n" msgstr "den midlertidige database %s eksisterer allerede\n" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "creating directory %s\n" msgstr "" "opretter kataloget %s\n" "\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, c-format msgid "creating directory %s: %s\n" msgstr "opretter kataloget %s: %s\n" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, c-format msgid "opening old database with dbapi %d\n" msgstr "åbner gammel database med dbapi %d\n" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "opening new database with dbapi %d\n" msgstr "åbner ny database med dbapi %d\n" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "post nummer %d i databasen er fejlbehæftet -- overspringer.\n" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kunne ikke tilføje posten, der tidligere var ved %d\n" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunne ikke genopbygge database: original-databasen beholdes\n" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "kunne ikke erstatte gammel database med ny database!\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "erstat filer i %s med filer fra %s for at genoprette" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, c-format msgid "removing directory %s\n" msgstr "fjerner kataloget %s\n" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunne ikke fjerne katalog %s: %s\n" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n" "Language-Team: German <de@li.org>\n" @@ -1683,7 +1683,7 @@ msgstr "kann Datei %s nicht öffnen: " msgid "cannot write to %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" @@ -3274,25 +3274,25 @@ msgstr "Datenbank aus der vorhandenen neu erstellen" msgid "verified db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kann %s lock für die Datenbank nicht bekommen" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "exklusiv" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "geteilt" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" @@ -3513,76 +3513,76 @@ msgstr "Fehler beim Löschen des Eintrags %s nach %s" msgid "error(%d) storing record %s into %s\n" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "die temporäre Datenbank %s existiert schon" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" # , c-format -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 1998-05-02 21:41:47-0400\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" @@ -1570,7 +1570,7 @@ msgstr "en voinut avata tiedostoa %s: " msgid "cannot write to %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" @@ -3136,25 +3136,25 @@ msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" msgid "verified db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "en voi saada %s lukitusta tietokantaan" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "poissulkevaa" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "jaettua" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" @@ -3370,74 +3370,74 @@ msgstr "virhe poistettaessa tietuetta %s %s:stä" msgid "error(%d) storing record %s into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "väliaikainen tietokanta %s on jo olemassa" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "en voi lisätä tietuetta %d:stä" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "en voinut avata %s: %s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1595,7 +1595,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "cannot write to %%%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -3171,25 +3171,25 @@ msgstr "impossible d'ouvrir: %s\n" msgid "verified db index %s/%s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "impossible d'ouvrir: %s\n" @@ -3404,74 +3404,74 @@ msgstr "impossible d'ouvrir: %s\n" msgid "error(%d) storing record %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" @@ -1505,7 +1505,7 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, c-format msgid "error creating temporary file %s\n" msgstr "" @@ -2984,25 +2984,25 @@ msgstr "" msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -3213,74 +3213,74 @@ msgstr "" msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen <ra@hp.is>\n" "Language-Team: is <kde-isl@mmedia.is>\n" @@ -1518,7 +1518,7 @@ msgstr "gat ekki búið til %%%s %s\n" msgid "cannot write to %%%s %s\n" msgstr "get ekki ritað í %%%s %s\n" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, c-format msgid "error creating temporary file %s\n" msgstr "" @@ -3014,25 +3014,25 @@ msgstr "" msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "einka" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "deildann" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -3243,74 +3243,74 @@ msgstr "" msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n" "Language-Team: JRPM <jrpm@linux.or.jp>\n" @@ -1593,7 +1593,7 @@ msgstr "%s ¤òºîÀ®¤Ç¤¤Þ¤»¤ó: %s\n" msgid "cannot write to %%%s %s\n" msgstr "%s ¤Ø½ñ¤¹þ¤á¤Þ¤»¤ó" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "°ì»þ¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼" @@ -3184,25 +3184,25 @@ msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" msgid "verified db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤¤Þ¤»¤ó" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "½ü³°" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "¶¦Í" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" @@ -3417,76 +3417,76 @@ msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" msgid "error(%d) storing record %s into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥¥Ã¥×¤·¤Þ¤¹" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤´¹¤¨¤Þ¤¹" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n" "Language-Team: GNU Translation project <ko@li.org>\n" @@ -1534,7 +1534,7 @@ msgstr "%%%s %s(À»)¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" msgid "cannot write to %%%s %s\n" msgstr "%%%s %s(À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, c-format msgid "error creating temporary file %s\n" msgstr "Àӽà ÆÄÀÏ %s(À»)¸¦ »ý¼ºÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" @@ -3068,25 +3068,25 @@ msgstr "´ÝÈù db À妽º %s/%s\n" msgid "verified db index %s/%s\n" msgstr "°ËÁõµÈ db À妽º %s/%s\n" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "¿©´ÂÁß db À妽º %s/%s %s ¸ðµå=0x%x\n" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "%2$s/%3$sÀÇ Àá±ÝµÈ(lock) %1$s(À»)¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "Æó¼âÀû(exclusive)" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "°øÀ¯µÊ" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, c-format msgid "locked db index %s/%s\n" msgstr "Àá±ÝµÈ db À妽º %s/%s\n" @@ -3304,75 +3304,75 @@ msgstr "%2$s À妽º¿¡ %1$d Ç׸ñµé(entries)À» Ãß°¡ÇÕ´Ï´Ù.\n" msgid "error(%d) storing record %s into %s\n" msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "db3¸¦ À籸ÃàÇÑ ÈÄ¿¡ %s(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%2$s¿¡ %1$s µ¥ÀÌÅͺ£À̽º¸¦ À籸Ãà ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, c-format msgid "temporary database %s already exists\n" msgstr "Àӽà µ¥ÀÌÅͺ£À̽º %s(ÀÌ)°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "creating directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, c-format msgid "creating directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÔ: %s\n" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, c-format msgid "opening old database with dbapi %d\n" msgstr "dbapi %d·Î ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "opening new database with dbapi %d\n" msgstr "dbapi %d·Î »õ·Î¿î µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u(ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, c-format msgid "cannot add record originally at %u\n" msgstr "%u¿¡ óÀ½ºÎÅÍ ·¹Äڵ带 Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "µ¥ÀÌÅͺ£À̽º¸¦ À籸ÃàÇϴµ¥ ½ÇÆÐÇÔ: ¿øº» µ¥ÀÌÅͺ£À̽º´Â ±×´ë·Î À¯ÁöµË´Ï´Ù\n" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ »õ·Î¿î µ¥ÀÌÅͺ£À̽º·Î ±³Ã¼Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù!\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "º¹±¸Çϱâ À§ÇØ %2$sÀÇ ÆÄÀÏÀ» %1$sÀÇ ÆÄÀÏ·Î ±³Ã¼ÇÕ´Ï´Ù" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, c-format msgid "removing directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian <no@li.org>\n" @@ -1533,7 +1533,7 @@ msgstr "kan ikke opprette %%%s %s\n" msgid "cannot write to %%%s %s\n" msgstr "kan ikke skrive til %%%s %s\n" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, c-format msgid "error creating temporary file %s\n" msgstr "feil under oppretting av midlertidig fil %s\n" @@ -3046,25 +3046,25 @@ msgstr "" msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -3275,74 +3275,74 @@ msgstr "" msgid "error(%d) storing record %s into %s\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -1575,7 +1575,7 @@ msgstr "nie mo¿na utworzyæ %s" msgid "cannot write to %%%s %s\n" msgstr "nie mo¿na zapisaæ do %s" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "b³±d w tworzeniu pliku tymczasowego %s" @@ -3137,25 +3137,25 @@ msgstr "usuwanie indeksu plików dla %s\n" msgid "verified db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otwiernie bazê danych w trybie 0x%x w %s\n" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" @@ -3370,75 +3370,75 @@ msgstr "zmiana nazwy %s na %s\n" msgid "error(%d) storing record %s into %s\n" msgstr "b³±d zapisywania rekordu %s do %s" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "odbudowywujê bazê danych w rootdir %s\n" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "tymczasowa baza danych %s ju¿ istnieje" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otwieranie starej bazy danych\n" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otwieranie nowej bazy danych\n" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "zamiana starej bazy na now± nie powiod³a siê!\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "naprawcze zastêpowanie plików w %s plikami z %s" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n" "Language-Team: pt <morais@kde.org\n" @@ -1551,7 +1551,7 @@ msgstr "não consigo criar o %%%s %s\n" msgid "cannot write to %%%s %s\n" msgstr "não consigo escrever em %%%s %s\n" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, c-format msgid "error creating temporary file %s\n" msgstr "erro ao criar o ficheiro temporário %s\n" @@ -3078,25 +3078,25 @@ msgstr "fechei o índice do db %s/%s\n" msgid "verified db index %s/%s\n" msgstr "verifiquei o índice do db %s/%s\n" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "a abrir o índice do db %s/%s %s modo=0x%x\n" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "não consigo trancar o %s no %s/%s\n" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "exclusivo" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "partilhado" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, c-format msgid "locked db index %s/%s\n" msgstr "tranquei o índice do db %s/%s\n" @@ -3309,75 +3309,75 @@ msgstr "a adicionar %d registos ao índice %s.\n" msgid "error(%d) storing record %s into %s\n" msgstr "erro(%d) ao guardar o registo %s em %s\n" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "a remover o %s depois duma reconstrução bem sucedida do db3.\n" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "não foi definido o dbpath" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, c-format msgid "rebuilding database %s into %s\n" msgstr "a reconstruir a base de dados %s em %s\n" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, c-format msgid "temporary database %s already exists\n" msgstr "A base de dados temporária %s já existe\n" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "creating directory %s\n" msgstr "a criar a directoria %s\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, c-format msgid "creating directory %s: %s\n" msgstr "a criar a directoria %s: %s\n" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, c-format msgid "opening old database with dbapi %d\n" msgstr "a abrir a base de dados antiga com a dbapi %d\n" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "opening new database with dbapi %d\n" msgstr "a abrir a base de dados nova com a dbapi %d\n" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "o número do registo %u na base de dados está errado -- a ignorar.\n" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, c-format msgid "cannot add record originally at %u\n" msgstr "não consigo adicionar o registo originalmente em %u\n" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "falhou a reconstrução da base de dados: a base de dados original mantém-se\n" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "falhou a substituição da base de dados antiga pela nova!\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "substituir os ficheiros em %s por ficheiros de %s a recuperar" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, c-format msgid "removing directory %s\n" msgstr "a remover a directoria %s\n" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "falhou a remoção da directoria %s: %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 9a8082a73..13e47a9fd 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" @@ -1699,7 +1699,7 @@ msgid "cannot write to %%%s %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "No consegui abrir: %s\n" @@ -3339,25 +3339,25 @@ msgstr "reconstrua o banco de dados a partir de um banco de dados existente" msgid "verified db index %s/%s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "no foi passado pacote para desinstalao" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" @@ -3583,66 +3583,66 @@ msgstr "No consegui abrir: %s\n" msgid "error(%d) storing record %s into %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, c-format msgid "temporary database %s already exists\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" @@ -3655,13 +3655,13 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "RPM verso %s\n" # , c-format -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "No consegui abrir: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton <gafton@redhat.com>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -1505,7 +1505,7 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, c-format msgid "error creating temporary file %s\n" msgstr "" @@ -2984,25 +2984,25 @@ msgstr "" msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -3213,74 +3213,74 @@ msgstr "" msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 8c2b166ff..a3645d05a 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1511,7 +1511,7 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, c-format msgid "error creating temporary file %s\n" msgstr "" @@ -2990,25 +2990,25 @@ msgstr "" msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -3219,74 +3219,74 @@ msgstr "" msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 2002-04-09 16:44-0400\n" "Last-Translator: Eugene Kanter, <eugene@bcl.bz>\n" "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n" @@ -1556,7 +1556,7 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %%%s %s\n" msgid "cannot write to %%%s %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÉÓÁÔØ × %%%s %s\n" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, c-format msgid "error creating temporary file %s\n" msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s\n" @@ -3077,25 +3077,25 @@ msgstr "ÚÁËÒÙÔ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" msgid "verified db index %s/%s\n" msgstr "ÐÒÏ×ÅÒÅÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s %s mode=0x%x\n" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÂÌÏËÉÒÏ×ËÕ %s ÎÁ %s/%s\n" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "ÒÁÚÄÅÌÑÅÍÙÊ" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, c-format msgid "locked db index %s/%s\n" msgstr "ÚÁÂÌÏËÉÒÏ×ÁÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" @@ -3309,75 +3309,75 @@ msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ × ÉÎÄÅËÓ %s\n" msgid "error(%d) storing record %s into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s ÐÏÓÌÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÅÒÅÉÎÄÅËÁÃÉÉ ÂÁÚÙ × db3.\n" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, c-format msgid "temporary database %s already exists\n" msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ\n" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "creating directory %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, c-format msgid "creating directory %s: %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s: %s\n" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, c-format msgid "opening old database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "opening new database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, c-format msgid "cannot add record originally at %u\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %u)\n" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, c-format msgid "removing directory %s\n" msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" @@ -1573,7 +1573,7 @@ msgstr "nie je mo¾né zapísa» do %s: " msgid "cannot write to %%%s %s\n" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "chyba pri vytváraní doèasného súboru %s" @@ -3133,25 +3133,25 @@ msgstr "odstraòuje sa index súborov pre %s\n" msgid "verified db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otvára sa databáza s právami 0x%x v %s\n" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "nie je mo¾né získa» %s zámok pre databázu" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "výhradný" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "zdieµaný" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" @@ -3366,75 +3366,75 @@ msgstr "premenováva sa %s na %s\n" msgid "error(%d) storing record %s into %s\n" msgstr "chyba pri zápise záznamu %s do %s" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "znovu sa vytvára databáza v adresári %s\n" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "doèasná databáza %s u¾ existuje" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otvára sa stará databáza\n" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otvára sa nová databáza\n" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie je mo¾né prida» záznam pôvodne na %d" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "nepodarilo sa nahradi» starú databázu novou!\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "nahradí súbory v %s súbormi z %s kvôli obnove" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstráni» adresár %s: %s\n" @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000. -# $Id: sl.po,v 1.312 2002/08/13 16:37:28 jbj Exp $ +# $Id: sl.po,v 1.313 2002/08/13 20:42:15 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -1576,7 +1576,7 @@ msgstr "ni mo¾no ustvariti %s: %s\n" msgid "cannot write to %%%s %s\n" msgstr "pisanje na %s ni mo¾no" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "napaka pri ustvarjanju zaèasne datoteke %s" @@ -3136,25 +3136,25 @@ msgstr "zaprto db kazalo %s/%s\n" msgid "verified db index %s/%s\n" msgstr "zaprto db kazalo %s/%s\n" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "odpiranje db kazala %s/%s %s naèin=0x%x\n" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ni mo¾no zakleniti z %s datotek %s/%s\n" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "izkljuèujoèe" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "skupno" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "zaklenjeno db kazalo %s/%s\n" @@ -3371,77 +3371,77 @@ msgstr "dodajanje %d vnosov v kazalo %s.\n" msgid "error(%d) storing record %s into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "zaèasna podatkovna zbirka %s ¾e obstaja" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "odpiranje stare podatkovne zbirke\n" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno." -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "zapisa ni mo¾no dodati na %d" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ponovna izgradnja podatkovne zbirke je bila neuspe¹na; stara ostaja na\n" "istem mestu\n" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe¹na!\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "odstranjevanje imenika: %s\n" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspe¹na odstranitev imenika %s: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -1563,7 +1563,7 @@ msgstr "Ne mogu da otvorim datoteku %s: " msgid "cannot write to %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, fuzzy, c-format msgid "error creating temporary file %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" @@ -3127,25 +3127,25 @@ msgstr "rekreiraj bazu podataka iz postojeæe baze" msgid "verified db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "ekskluzivno" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "deljeno" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" @@ -3361,74 +3361,74 @@ msgstr "gre¹ka uklanjanja sloga %s u %s" msgid "error(%d) storing record %s into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "privremena baza podataka %s veæ postoji" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "ne mogu da dodam slog originalno na %d" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspelo otvaranje %s: %s" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.1\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 2002-07-11 22:49+0200\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -1531,7 +1531,7 @@ msgstr "kan inte skapa %%%s %s\n" msgid "cannot write to %%%s %s\n" msgstr "kan inte skriva till %%%s %s\n" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, c-format msgid "error creating temporary file %s\n" msgstr "fel när tämporärfil %s skapades\n" @@ -3032,25 +3032,25 @@ msgstr "stängde db-index %s/%s\n" msgid "verified db index %s/%s\n" msgstr "verifierade db-index %s/%s\n" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "öppnar db-index %s/%s %s rättighet=0x%x\n" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kan inte få %s lås på %s/%s\n" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "uteslutande" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "delat" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, c-format msgid "locked db index %s/%s\n" msgstr "låste db-index %s/%s\n" @@ -3261,74 +3261,74 @@ msgstr "lägger till %d poster till %s-indexet.\n" msgid "error(%d) storing record %s into %s\n" msgstr "fel(%d) när post %s sparades i %s\n" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "tar bort %s efter lyckad db3-ombyggnad.\n" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "ingen dbpath har satts" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, c-format msgid "rebuilding database %s into %s\n" msgstr "bygger om databas %s till %s\n" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, c-format msgid "temporary database %s already exists\n" msgstr "tillfällig databas %s existerar redan\n" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "creating directory %s\n" msgstr "skapar katalog %s\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, c-format msgid "creating directory %s: %s\n" msgstr "skapar katalog %s: %s\n" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, c-format msgid "opening old database with dbapi %d\n" msgstr "öppnar gammal databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "opening new database with dbapi %d\n" msgstr "öppnar ny databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "post nummer %u i databasen är felaktig -- hoppar över.\n" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, c-format msgid "cannot add record originally at %u\n" msgstr "kan inte lägga till post ursprungligen vid %u\n" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "kunde inte ersätta gammal databas med ny databas!\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "byt ut filer i %s med filer från %s för att återställa" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, c-format msgid "removing directory %s\n" msgstr "tar bort katalog %s\n" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunde inte ta bort katalogen %s: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-13 12:17-0400\n" +"POT-Creation-Date: 2002-08-13 16:17-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -1564,7 +1564,7 @@ msgstr "%%%s dosyasý oluþturulamýyor: %s\n" msgid "cannot write to %%%s %s\n" msgstr "%%%s dosyasýna yazýlamaz %s\n" -#: lib/misc.c:240 lib/misc.c:245 lib/misc.c:251 +#: lib/misc.c:190 lib/misc.c:195 lib/misc.c:201 #, c-format msgid "error creating temporary file %s\n" msgstr "%s geçici dosyasý oluþturulurken hata\n" @@ -3090,25 +3090,25 @@ msgstr "kapandý db endeks %s/%s\n" msgid "verified db index %s/%s\n" msgstr "doðrulandý db endeks %s/%s\n" -#: rpmdb/db3.c:967 +#: rpmdb/db3.c:972 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "açýlýyor db endeks %s/%s %s kip=0x%x\n" -#: rpmdb/db3.c:1183 +#: rpmdb/db3.c:1188 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "%s kilit %s/%s'den alýnamadý\n" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "exclusive" msgstr "baðdaþýk" -#: rpmdb/db3.c:1185 +#: rpmdb/db3.c:1190 msgid "shared" msgstr "paylaþýmlý" -#: rpmdb/db3.c:1189 +#: rpmdb/db3.c:1194 #, c-format msgid "locked db index %s/%s\n" msgstr "kilitli db endeks %s/%s\n" @@ -3319,76 +3319,76 @@ msgstr "%d girdi %s indeksine ekleniyor.\n" msgid "error(%d) storing record %s into %s\n" msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n" -#: rpmdb/rpmdb.c:3625 +#: rpmdb/rpmdb.c:3620 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "baþarýlý db3 yeniden oluþturma ertesinde %s kaldýrýlýyor\n" -#: rpmdb/rpmdb.c:3663 +#: rpmdb/rpmdb.c:3658 msgid "no dbpath has been set" msgstr "belirtilmiþ bir dbpath yok" -#: rpmdb/rpmdb.c:3695 +#: rpmdb/rpmdb.c:3690 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%s veritabaný %s içinde yeniden oluþturuluyor\n" -#: rpmdb/rpmdb.c:3699 +#: rpmdb/rpmdb.c:3694 #, c-format msgid "temporary database %s already exists\n" msgstr "geçici veritabaný %s zaten mevcut\n" -#: rpmdb/rpmdb.c:3705 +#: rpmdb/rpmdb.c:3700 #, c-format msgid "creating directory %s\n" msgstr "%s dizini oluþturuluyor\n" -#: rpmdb/rpmdb.c:3707 +#: rpmdb/rpmdb.c:3702 #, c-format msgid "creating directory %s: %s\n" msgstr "%s dizini oluþturuluyor: %s\n" -#: rpmdb/rpmdb.c:3714 +#: rpmdb/rpmdb.c:3709 #, c-format msgid "opening old database with dbapi %d\n" msgstr "eski veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3727 +#: rpmdb/rpmdb.c:3722 #, c-format msgid "opening new database with dbapi %d\n" msgstr "yeni veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3756 +#: rpmdb/rpmdb.c:3751 #, fuzzy, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "veritabanýndaki %u. kayýt hatalý -- atlanýyor\n" -#: rpmdb/rpmdb.c:3796 +#: rpmdb/rpmdb.c:3791 #, c-format msgid "cannot add record originally at %u\n" msgstr "kayýt özgün olarak %u e eklenemedi\n" -#: rpmdb/rpmdb.c:3814 +#: rpmdb/rpmdb.c:3809 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "veritabaný yeniden oluþturulamadý: mevcut veritabaný deðiþmeden\n" "yerinde býrakýldý\n" -#: rpmdb/rpmdb.c:3822 +#: rpmdb/rpmdb.c:3817 msgid "failed to replace old database with new database!\n" msgstr "eski veritabanýnýn yenisiyle deðiþtirilirmesi baþarýsýz!\n" -#: rpmdb/rpmdb.c:3824 +#: rpmdb/rpmdb.c:3819 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "kurtarmak için %s içindeki dosyalar %s deki dosyalarla deðiþtiriliyor" -#: rpmdb/rpmdb.c:3834 +#: rpmdb/rpmdb.c:3829 #, c-format msgid "removing directory %s\n" msgstr "%s dizini siliniyor\n" -#: rpmdb/rpmdb.c:3836 +#: rpmdb/rpmdb.c:3831 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s dizininin silinmesi baþarýsýz: %s\n" diff --git a/rpm.spec.in b/rpm.spec.in index 7dd73907b..b251cf878 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -17,7 +17,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.78 +Release: 0.79 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -192,6 +192,7 @@ install -m 644 scripts/rpm.log ${RPM_BUILD_ROOT}/etc/logrotate.d/rpm mkdir -p $RPM_BUILD_ROOT/etc/rpm +mkdir -p $RPM_BUILD_ROOT/var/spool/repackage mkdir -p $RPM_BUILD_ROOT/var/lib/rpm for dbi in \ Basenames Conflictname Dirnames Group Installtid Name Providename \ @@ -292,6 +293,7 @@ fi %dir /etc/rpm #%config(noreplace,missingok) /etc/rpm/macros.* %attr(0755, @RPMUSER@, @RPMGROUP@) %dir /var/lib/rpm +%attr(0755, @RPMUSER@, @RPMGROUP@) %dir /var/spool/repackage %define rpmdbattr %attr(0644, @RPMUSER@, @RPMGROUP@) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %rpmdbattr /var/lib/rpm/Basenames @@ -517,8 +519,11 @@ fi %{__prefix}/include/popt.h %changelog -* Tue Aug 13 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.78 +* Tue Aug 13 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.79 - supply transitive closure for CLI packages from rpmdb-redhat database. +- fix: rebuilddb stat'ed target, not source, for rename sanity. +- create /var/lib/rpm if non-existent in, say, a chroot. +- erased packages are now repackaged into /var/spool/repackage. * Fri Aug 9 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.77 - python: add return codes for rollbacks and fooDB methods. diff --git a/rpmdb/db3.c b/rpmdb/db3.c index bbd18969e..6414a9482 100644 --- a/rpmdb/db3.c +++ b/rpmdb/db3.c @@ -862,6 +862,11 @@ static int db3open(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip) } /* + * Create the /var/lib/rpm directory if it doesn't exist (root only). + */ + (void) rpmioMkpath(dbhome, 0755, getuid(), getgid()); + + /* * Avoid incompatible DB_CREATE/DB_RDONLY flags on DBENV->open. */ if (dbi->dbi_use_dbenv) { diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index 1fed7c808..dfbfe5ef2 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -3575,9 +3575,9 @@ static int rpmdbMoveDatabase(const char * prefix, continue; sprintf(nfilename, "%s/%s/%s", prefix, newdbpath, base); (void)rpmCleanPath(nfilename); - if (Stat(nfilename, nst)) + if (stat(ofilename, nst)) continue; - if ((xx = Rename(ofilename, nfilename)) != 0) { + if ((xx = rename(ofilename, nfilename)) != 0) { rc = 1; continue; } @@ -3597,12 +3597,7 @@ static int rpmdbMoveDatabase(const char * prefix, xx = unlink(ofilename); sprintf(nfilename, "%s/%s/__db.%03d", prefix, newdbpath, i); (void)rpmCleanPath(nfilename); -#ifdef DYING - if ((xx = Rename(ofilename, nfilename)) != 0) - rc = 1; -#else xx = unlink(nfilename); -#endif } break; case 2: diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c index e0613dbd3..81c086aeb 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.c @@ -3152,6 +3152,54 @@ int Fcntl(FD_t fd, int op, void *lip) /* =============================================================== */ /* Helper routines that may be generally useful. */ +int rpmioMkpath(const char * path, mode_t mode, uid_t uid, gid_t gid) +{ + char * d, * de; + int created = 0; + int rc; + + if (path == NULL) + return -1; + d = alloca(strlen(path)+2); + de = stpcpy(d, path); + de[1] = '\0'; + for (de = d; *de != '\0'; de++) { + struct stat st; + char savec; + + while (*de && *de != '/') de++; + savec = de[1]; + de[1] = '\0'; + + rc = Stat(d, &st); + if (rc) { + switch(errno) { + default: + return errno; + /*@notreached@*/ /*@switchbreak@*/ break; + case ENOENT: + /*@switchbreak@*/ break; + } + rc = Mkdir(d, mode); + if (rc) + return errno; + created = 1; + if (!(uid == (uid_t) -1 && gid == (gid_t) -1)) { + rc = chown(d, uid, gid); + if (rc) + return errno; + } + } else if (!S_ISDIR(st.st_mode)) { + return ENOTDIR; + } + de[1] = savec; + } + rc = 0; + if (created) + rpmMessage(RPMMESS_DEBUG, "created directory(s) %s mode 0%o\n", + path, mode); + return rc; +} /*@-boundswrite@*/ int rpmioSlurp(const char * fn, const byte ** bp, ssize_t * blenp) diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h index 1b7ec8492..2a39639e6 100644 --- a/rpmio/rpmio.h +++ b/rpmio/rpmio.h @@ -544,6 +544,18 @@ int fdReadable(FD_t fd, int secs) /*@=exportlocal@*/ /** + * Insure that directories in path exist, creating as needed. + * @param path diretory path + * @param mode directory mode (if created) + * @param uid directory uid (if created), or -1 to skip + * @param gid directory uid (if created), or -1 to skip + * @return 0 on success, errno (or -1) on error + */ +int rpmioMkpath(const char * path, mode_t mode, uid_t uid, gid_t gid) + /*@globals fileSystem, internalState @*/ + /*@modifies fileSystem, internalState @*/; + +/** * FTP and HTTP error codes. */ /*@-typeuse@*/ |