Remove dead code.

CVS patchset: 4603
CVS date: 2001/03/03 20:45:47

diff --git a/lib/psm.c b/lib/psm.c
index 2d9cb17..1e8fa19 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -1411,6 +1411,7 @@ assert(psm->mi == NULL);
        if (psm->goal == PSM_PKGINSTALL) {
            psm->scriptTag = RPMTAG_PREIN;
            psm->progTag = RPMTAG_PREINPROG;
+
            rc = psmStage(psm, PSM_SCRIPT);
            if (rc) {
                rpmError(RPMERR_SCRIPT,
@@ -1419,24 +1420,14 @@ assert(psm->mi == NULL);
                        fi->name, fi->version, fi->release);
                break;
            }
-
-#ifdef DYING
-           /* Change root directory if requested and not already done. */
-           (void) psmStage(psm, PSM_CHROOT_IN);
-#endif
        }
+
        if (psm->goal == PSM_PKGERASE) {
            psm->scriptTag = RPMTAG_PREUN;
            psm->progTag = RPMTAG_PREUNPROG;
            psm->sense = RPMSENSE_TRIGGERUN;
            psm->countCorrection = -1;
 
-#ifdef DYING
-           /* Change root directory if requested and not already done. */
-           rc = psmStage(psm, PSM_CHROOT_IN);
-           if (rc) break;
-#endif
-
            rc = psmStage(psm, PSM_TRIGGERS);
            if (rc) break;
 
@@ -1504,11 +1495,6 @@ assert(psm->mi == NULL);
            /* Write the metadata section into the package. */
            rc = headerWrite(psm->fd, psm->oh, HEADER_MAGIC_YES);
            if (rc) break;
-
-#ifdef DYING
-           /* Change root directory if requested and not already done. */
-           rc = psmStage(psm, PSM_CHROOT_IN);
-#endif
        }
        break;
     case PSM_PROCESS:
@@ -1603,11 +1589,6 @@ assert(psm->mi == NULL);
        if (psm->goal == PSM_PKGINSTALL) {
            int_32 installTime = time(NULL);
 
-#ifdef DYING
-           /* Restore root directory if changed. */
-           (void) psmStage(psm, PSM_CHROOT_OUT);
-#endif
-
            if (fi->fc > 0 && fi->fstates)
                headerAddEntry(fi->h, RPMTAG_FILESTATES, RPM_CHAR_TYPE,
                                fi->fstates, fi->fc);

diff --git a/po/rpm.pot b/po/rpm.pot
index 4df4a05..809b9cf 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-03 15:26-0500\n"
+"POT-Creation-Date: 2001-03-03 15:43-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:484 lib/psm.c:1490
+#: build/pack.c:484 lib/psm.c:1481
 #, 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:566 lib/psm.c:1696
+#: build/pack.c:566 lib/psm.c:1677
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2926,21 +2926,21 @@ msgstr ""
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1417
+#: lib/psm.c:1418
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:1544
+#: lib/psm.c:1530
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1545
+#: lib/psm.c:1531
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1783
+#: lib/psm.c:1764
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""