- permit args to be hidden within %%__find_{requires,provides}.

- a couple more perl.{prov,req} fiddles.

CVS patchset: 5289
CVS date: 2002/02/01 15:19:44

1 files changed, 100 insertions, 86 deletions

diff --git a/po/it.po b/po/it.po
index ef1c7146c..13e2cae7c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-27 11:31-0500\n"
+"POT-Creation-Date: 2002-02-01 10:09-0500\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"
@@ -118,7 +118,7 @@ msgstr ""
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: lib/poptI.c:200 rpmqv.c:126
+#: lib/poptI.c:210 rpmqv.c:126
 msgid "<dir>"
 msgstr ""
 
@@ -405,7 +405,7 @@ msgid "no tar files given for build"
 msgstr ""
 
 #: rpmqv.c:1036
-msgid "no packages given for uninstall"
+msgid "no packages given for erase"
 msgstr ""
 
 #: rpmqv.c:1047
@@ -666,17 +666,17 @@ msgstr ""
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2465
+#: build/files.c:2485
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2491 build/files.c:2505
+#: build/files.c:2514 build/files.c:2528
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2626
+#: build/files.c:2650
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1456,37 +1456,42 @@ msgstr ""
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1033
+#: lib/depends.c:958
+#, c-format
+msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
+msgstr ""
+
+#: lib/depends.c:1073
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1303
+#: lib/depends.c:1341
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1409
+#: lib/depends.c:1447
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1502
+#: lib/depends.c:1540
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1572
+#: lib/depends.c:1610
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1607
+#: lib/depends.c:1645
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1612
+#: lib/depends.c:1650
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -1621,207 +1626,211 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptI.c:47
+#: lib/poptI.c:53
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: lib/poptI.c:59
+#: lib/poptI.c:65
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: lib/poptI.c:61
+#: lib/poptI.c:67
 msgid "relocations must contain a ="
 msgstr ""
 
-#: lib/poptI.c:64
+#: lib/poptI.c:70
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:81
-msgid "malformed rollback time"
+#: lib/poptI.c:84
+msgid "rollback takes a time/date stamp argument"
+msgstr ""
+
+#: lib/poptI.c:91
+msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:100
+#: lib/poptI.c:110
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:104
+#: lib/poptI.c:114
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:110 lib/poptI.c:161
+#: lib/poptI.c:120 lib/poptI.c:171
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:114
+#: lib/poptI.c:124
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:117
+#: lib/poptI.c:127
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:120
+#: lib/poptI.c:130
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:120
+#: lib/poptI.c:130
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:123
+#: lib/poptI.c:133
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:135
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:126
+#: lib/poptI.c:136
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:129
+#: lib/poptI.c:139
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:132
+#: lib/poptI.c:142
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:133 lib/poptI.c:149 lib/poptI.c:221
+#: lib/poptI.c:143 lib/poptI.c:159 lib/poptI.c:231
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:135
+#: lib/poptI.c:145
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:138
+#: lib/poptI.c:148
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:141
+#: lib/poptI.c:151
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:144
+#: lib/poptI.c:154
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:146
+#: lib/poptI.c:156
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:159
 msgid "install package"
 msgstr ""
 
-#: lib/poptI.c:151
+#: lib/poptI.c:161
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:153
+#: lib/poptI.c:163
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:156
+#: lib/poptI.c:166
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:174
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:177
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:170
+#: lib/poptI.c:180
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:173
+#: lib/poptI.c:183
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:177
+#: lib/poptI.c:187
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:180
+#: lib/poptI.c:190
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:193
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:186
+#: lib/poptI.c:196
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:189
+#: lib/poptI.c:199
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:193
+#: lib/poptI.c:203
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:197
+#: lib/poptI.c:207
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:199
+#: lib/poptI.c:209
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:212
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:203
+#: lib/poptI.c:213
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:206
+#: lib/poptI.c:216
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:209
+#: lib/poptI.c:219
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:212
+#: lib/poptI.c:222
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:214
-msgid "deinstall new package(s), reinstall old package(s), back to date"
+#: lib/poptI.c:224
+msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:225
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:217
+#: lib/poptI.c:227
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:220
+#: lib/poptI.c:230
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -2422,7 +2431,7 @@ msgstr ""
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:521 lib/rpminstall.c:1029
 msgid "failed dependencies:\n"
 msgstr ""
 
@@ -2454,6 +2463,11 @@ msgstr ""
 msgid "Installing %s\n"
 msgstr ""
 
+#: lib/rpminstall.c:1022
+#, c-format
+msgid "rollback %d packages to %s"
+msgstr ""
+
 #: lib/rpmlead.c:50
 #, c-format
 msgid "read failed: %s (%d)\n"
@@ -2997,109 +3011,109 @@ msgstr ""
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2096 rpmdb/rpmdb.c:3349
+#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2149
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2419
+#: rpmdb/rpmdb.c:2420
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2491
+#: rpmdb/rpmdb.c:2492
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2500
+#: rpmdb/rpmdb.c:2501
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2701
+#: rpmdb/rpmdb.c:2702
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2782
+#: rpmdb/rpmdb.c:2783
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2793
+#: rpmdb/rpmdb.c:2794
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:3236
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3269
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3295
+#: rpmdb/rpmdb.c:3296
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3299
+#: rpmdb/rpmdb.c:3300
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3305
+#: rpmdb/rpmdb.c:3306
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3307
+#: rpmdb/rpmdb.c:3308
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3314
+#: rpmdb/rpmdb.c:3315
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3325
+#: rpmdb/rpmdb.c:3326
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3407
+#: rpmdb/rpmdb.c:3408
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3415
+#: rpmdb/rpmdb.c:3416
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3417
+#: rpmdb/rpmdb.c:3418
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3427
+#: rpmdb/rpmdb.c:3428
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3430
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""