Rename RPMSIG_* signature types to RPMSIGTYPE_* to avoid confusion.

Remove dead code.

CVS patchset: 4549
CVS date: 2001/02/12 16:33:08

1 files changed, 43 insertions, 42 deletions

diff --git a/po/rpm.pot b/po/rpm.pot
index 46008d5c3..013d15296 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-11 16:49-0500\n"
+"POT-Creation-Date: 2001-02-12 10:41-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"
@@ -1808,7 +1808,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:481 lib/psm.c:1384
+#: build/pack.c:481 lib/psm.c:1304
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -1838,7 +1838,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:563 lib/psm.c:1448
+#: build/pack.c:563 lib/psm.c:1360
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2536,7 +2536,7 @@ msgstr ""
 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:207 lib/header.c:1081 lib/psm.c:504
+#: lib/header.c:207 lib/header.c:1081 lib/psm.c:388
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2904,12 +2904,12 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:348
+#: lib/psm.c:277
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:356
+#: lib/psm.c:285
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
@@ -2919,48 +2919,49 @@ msgstr ""
 #. * was used up - if so, we should return a different error.
 #.
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/psm.c:728
+#: lib/psm.c:612
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:729
+#: lib/psm.c:613
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:770
+#: lib/psm.c:654
 #, c-format
 msgid "cannot create %s %s\n"
 msgstr ""
 
-#: lib/psm.c:776
+#: lib/psm.c:660
 #, c-format
 msgid "cannot write to %s\n"
 msgstr ""
 
-#: lib/psm.c:797
+#: lib/psm.c:681
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/psm.c:849
+#: lib/psm.c:733
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:929
+#: lib/psm.c:813
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1000 lib/psm.c:1191
+#: lib/psm.c:927 lib/psm.c:1101
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1064 lib/psm.c:1146 lib/psm.c:1235 lib/psm.c:1257
+#. XXX WTFO? erase failures are not cause for stopping.
+#: lib/psm.c:991 lib/psm.c:1059 lib/psm.c:1151 lib/psm.c:1176
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
 
-#: lib/psm.c:1071
+#: lib/psm.c:998
 msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
 msgstr ""
 
@@ -3542,121 +3543,121 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/signature.c:115
+#: lib/signature.c:114
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:119
+#: lib/signature.c:118
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:123
+#: lib/signature.c:122
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:147
+#: lib/signature.c:146
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:151
+#: lib/signature.c:150
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:162
+#: lib/signature.c:161
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:218
+#: lib/signature.c:217
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:277
+#: lib/signature.c:276
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:287
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:295
+#: lib/signature.c:294
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:300
+#: lib/signature.c:299
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:311 lib/signature.c:388
+#: lib/signature.c:310 lib/signature.c:387
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:316
+#: lib/signature.c:315
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:354 lib/signature.c:700
+#: lib/signature.c:353 lib/signature.c:699
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:364
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:372
+#: lib/signature.c:371
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:377
+#: lib/signature.c:376
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:393
+#: lib/signature.c:392
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:421
+#: lib/signature.c:420
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:427
+#: lib/signature.c:426
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:507 lib/signature.c:568
+#: lib/signature.c:506 lib/signature.c:567
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:641
+#: lib/signature.c:640
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:729
+#: lib/signature.c:728
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:733 lib/signature.c:786
+#: lib/signature.c:732 lib/signature.c:785
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:766
+#: lib/signature.c:765
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:778
+#: lib/signature.c:777
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""