Unify rpmError() and rpmMessage() on top of rpmlog().

CVS patchset: 4148
CVS date: 2000/08/31 02:38:57

1 files changed, 86 insertions, 90 deletions

diff --git a/po/sr.po b/po/sr.po
index c7aca367a..53ad0330e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,13 +1,13 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-08-29 15:35-0400\n"
+"POT-Creation-Date: 2000-08-30 22:29-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
 "Xgettext-Options: --default-domain=rpm --add-comments --keyword=_ "
 "--keyword=N_\n"
 
-#: build.c:25 lib/rpminstall.c:458
+#: build.c:25 lib/rpminstall.c:459
 #, fuzzy, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "greška: ne mogu da otvorim %s%s/packages.rpm\n"
@@ -1115,40 +1115,40 @@ msgstr "--sign se može koristiti samo kod kreiranja paketa"
 msgid "exec failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: rpm.c:1029 rpmqv.c:1472
+#: rpm.c:1029 rpmqv.c:1471
 msgid "unexpected arguments to --querytags "
 msgstr "neočekivani argumenti za --querytags"
 
-#: rpm.c:1040 rpmqv.c:1494
+#: rpm.c:1040 rpmqv.c:1493
 msgid "no packages given for signature check"
 msgstr "nedostaje paket za proveru potpisa"
 
-#: rpm.c:1051 rpmqv.c:1505
+#: rpm.c:1051 rpmqv.c:1504
 msgid "no packages given for signing"
 msgstr "nedostaje paket za potpisivanje"
 
-#: rpm.c:1067 rpmqv.c:1344
+#: rpm.c:1067 rpmqv.c:1343
 msgid "no packages given for uninstall"
 msgstr "neodstaje paket za deinstalaciju"
 
-#: rpm.c:1118 rpmqv.c:1395
+#: rpm.c:1118 rpmqv.c:1394
 msgid "no packages given for install"
 msgstr "nedostaje paket za instalaciju"
 
-#: rpm.c:1141 rpmqv.c:1435
+#: rpm.c:1141 rpmqv.c:1434
 msgid "extra arguments given for query of all packages"
 msgstr "suvišni argumenti su navedeni za upit nad svim paketima"
 
-#: rpm.c:1146 rpmqv.c:1440
+#: rpm.c:1146 rpmqv.c:1439
 msgid "no arguments given for query"
 msgstr "nedostaju argumenti za upit"
 
-#: rpm.c:1163 rpmqv.c:1460
+#: rpm.c:1163 rpmqv.c:1459
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "suvišni argumenti su navedeni za upit nad svim paketima"
 
-#: rpm.c:1167 rpmqv.c:1464
+#: rpm.c:1167 rpmqv.c:1463
 msgid "no arguments given for verify"
 msgstr "nedostaju argumenti za proveru"
 
@@ -1553,11 +1553,11 @@ msgstr "--justdb možete koristiti samo kod instalacije i brisanja paketa"
 msgid "no packages files given for rebuild"
 msgstr "nedosataje paket za rekreiranje"
 
-#: rpmqv.c:1312
+#: rpmqv.c:1311
 msgid "no spec files given for build"
 msgstr "nedostaje specifikacije za kreiranje"
 
-#: rpmqv.c:1314
+#: rpmqv.c:1313
 msgid "no tar files given for build"
 msgstr "nedostaju 'tar' datoteke za kreiranje"
 
@@ -1933,7 +1933,7 @@ msgstr ""
 msgid "cannot create %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: build/parseBuildInstallClean.c:32
+#: build/parseBuildInstallClean.c:31
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
@@ -1966,17 +1966,17 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:47 build/parseScript.c:174
+#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parseDescription.c:65 build/parseFiles.c:59 build/parseScript.c:187
+#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:68 build/parseScript.c:197
+#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "paket %s nije naveden u %s"
@@ -1986,11 +1986,11 @@ msgstr "paket %s nije naveden u %s"
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:33
+#: build/parseFiles.c:32
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:75
+#: build/parseFiles.c:74
 msgid "line %d: Second %%files list"
 msgstr ""
 
@@ -2055,7 +2055,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePreamble.c:439 build/parseSpec.c:386
+#: build/parsePreamble.c:439 build/parseSpec.c:388
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2085,22 +2085,22 @@ msgstr "nedostaje arhitektura za %s na %s:%d"
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:682
+#: build/parsePreamble.c:681
 #, fuzzy, c-format
 msgid "Bad package specification: %s"
 msgstr "      Opcije odrednice paketa:"
 
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:687
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:715
+#: build/parsePreamble.c:714
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:740
+#: build/parsePreamble.c:739
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
@@ -2160,7 +2160,7 @@ msgstr ""
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:459
+#: build/parsePrep.c:458
 msgid "line %d: second %%prep"
 msgstr ""
 
@@ -2185,66 +2185,66 @@ msgstr "paket %s nije naveden u %s"
 msgid "line %d: Version required: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parseScript.c:142
+#: build/parseScript.c:141
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:152 build/parseScript.c:215
+#: build/parseScript.c:151 build/parseScript.c:214
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:162
+#: build/parseScript.c:161
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:206
+#: build/parseScript.c:205
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:136
+#: build/parseSpec.c:138
 #, fuzzy, c-format
 msgid "line %d: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:188
+#: build/parseSpec.c:190
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/parseSpec.c:200
+#: build/parseSpec.c:202
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:271
+#: build/parseSpec.c:273
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:279
+#: build/parseSpec.c:281
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:290
+#: build/parseSpec.c:292
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:304 build/parseSpec.c:313
+#: build/parseSpec.c:306 build/parseSpec.c:315
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:489
+#: build/parseSpec.c:491
 #, fuzzy
 msgid "No buildable architectures"
 msgstr "nemoj proveravati arhitekturu paketa"
 
-#: build/parseSpec.c:544
+#: build/parseSpec.c:546
 #, fuzzy
 msgid "Package has no %%description: %s"
 msgstr "paket %s nije naveden u %s"
@@ -2707,39 +2707,39 @@ msgstr "upit nad paketom koji ima <datoteku>"
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "preimenovanje %s u %s nije uspelo: %s"
 
-#: lib/install.c:892
+#: lib/install.c:893
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:939
+#: lib/install.c:940
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paket %s-%s-%s sadrži deljene datoteke\n"
 
-#: lib/install.c:999
+#: lib/install.c:1000
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1004
+#: lib/install.c:1005
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1029
+#: lib/install.c:1030
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1066
+#: lib/install.c:1067
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1154
+#: lib/install.c:1155
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3061,81 +3061,81 @@ msgid "can't query %s: %s\n"
 msgstr "greška: ne mogu da otvorim %s\n"
 
 #. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/query.c:515
+#: lib/query.c:514
 msgid "old format source packages cannot be queried\n"
 msgstr "Upit se ne može izvesti nad izvorni paketima u starom formatu\n"
 
-#: lib/query.c:524 lib/rpminstall.c:240
+#: lib/query.c:523 lib/rpminstall.c:241
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s ne liči na RPM paket\n"
 
-#: lib/query.c:528
+#: lib/query.c:527
 #, c-format
 msgid "query of %s failed\n"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/query.c:561
+#: lib/query.c:560
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/query.c:584
+#: lib/query.c:583
 #, fuzzy
 msgid "no packages\n"
 msgstr "upit nad svim paketima"
 
-#: lib/query.c:594
+#: lib/query.c:593
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s ne sadrži nijedan paket\n"
 
-#: lib/query.c:604
+#: lib/query.c:603
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "nijedan paket ne aktivira %s\n"
 
-#: lib/query.c:614
+#: lib/query.c:613
 #, c-format
 msgid "no package requires %s\n"
 msgstr "nijedan paket ne zahteva %s\n"
 
-#: lib/query.c:625
+#: lib/query.c:624
 #, c-format
 msgid "no package provides %s\n"
 msgstr "nijedan paket ne obezbeđuje %s\n"
 
-#: lib/query.c:655
+#: lib/query.c:654
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/query.c:658
+#: lib/query.c:657
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/query.c:684
+#: lib/query.c:683
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: lib/query.c:687
+#: lib/query.c:686
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: lib/query.c:691
+#: lib/query.c:690
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "ne mogu da pročitam slog %d\n"
 
-#: lib/query.c:702 lib/rpminstall.c:471
+#: lib/query.c:701 lib/rpminstall.c:472
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
@@ -3414,107 +3414,107 @@ msgstr "greška kod kreiranja direktorijuma %s: %s"
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpminstall.c:134
+#: lib/rpminstall.c:135
 #, fuzzy
 msgid "counting packages to install\n"
 msgstr "nedostaje paket za instalaciju"
 
-#: lib/rpminstall.c:138
+#: lib/rpminstall.c:139
 #, fuzzy, c-format
 msgid "found %d packages\n"
 msgstr "upit nad svim paketima"
 
-#: lib/rpminstall.c:143
+#: lib/rpminstall.c:144
 #, fuzzy
 msgid "looking for packages to download\n"
 msgstr "greška kod potrage za paketom %s\n"
 
-#: lib/rpminstall.c:158
+#: lib/rpminstall.c:159
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n"
 
-#: lib/rpminstall.c:173
+#: lib/rpminstall.c:174
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Pribavljam %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:183
+#: lib/rpminstall.c:184
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:187
+#: lib/rpminstall.c:188
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n"
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:226 lib/rpminstall.c:395
+#: lib/rpminstall.c:227 lib/rpminstall.c:396
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpminstall.c:244 lib/rpminstall.c:536
+#: lib/rpminstall.c:245 lib/rpminstall.c:537
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "greška: %s se ne može instalirati\n"
 
-#: lib/rpminstall.c:259
+#: lib/rpminstall.c:260
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "greška: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: lib/rpminstall.c:279
+#: lib/rpminstall.c:280
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpminstall.c:324
+#: lib/rpminstall.c:325
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpminstall.c:329
+#: lib/rpminstall.c:330
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:346
+#: lib/rpminstall.c:347
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "grupa %s ne sadrži nijedan paket\n"
 
-#: lib/rpminstall.c:357
+#: lib/rpminstall.c:358
 msgid "failed dependencies:\n"
 msgstr "loše međuzavisnosti:\n"
 
-#: lib/rpminstall.c:375
+#: lib/rpminstall.c:376
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "instaliraj paket"
 
-#: lib/rpminstall.c:474
+#: lib/rpminstall.c:475
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" određuje više paketa\n"
 
-#: lib/rpminstall.c:497
+#: lib/rpminstall.c:498
 msgid "removing these packages would break dependencies:\n"
 msgstr "uklanjanje oviha paketa će narušiti zavisnosti:\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:526
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "greška: ne mogu da otvorim %s\n"
 
-#: lib/rpminstall.c:531
+#: lib/rpminstall.c:532
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instaliram %s\n"
@@ -3898,22 +3898,18 @@ msgstr "neuspelo otvaranje %s: %s"
 msgid "File %s is smaller than %d bytes"
 msgstr ""
 
-#: rpmio/messages.c:59
+#: rpmio/rpmlog.c:83
 msgid "warning: "
 msgstr "upozorenje: "
 
-#: rpmio/messages.c:68
+#: rpmio/rpmlog.c:92
 msgid "error: "
 msgstr "greška: "
 
-#: rpmio/messages.c:77
+#: rpmio/rpmlog.c:103
 msgid "fatal error: "
 msgstr "fatalna greška: "
 
-#: rpmio/messages.c:86
-msgid "internal error (rpm bug?): "
-msgstr ""
-
 #: rpmio/rpmmalloc.c:13
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"