handle RPMTAG_ORIGFILENAMES properly

CVS patchset: 2715
CVS date: 1999/01/19 03:02:45

diff --git a/lib/install.c b/lib/install.c
index b33855c..2ab0a05 100644 (file)
--- a/lib/install.c
+++ b/lib/install.c
@@ -119,14 +119,15 @@ static int assembleFileList(Header h, struct fileMemory * mem,
     char * chptr;
     char ** languages, ** lang;
 
-    if (!headerGetEntry(h, RPMTAG_ORIGFILENAMES, NULL, (void **) &mem->names, 
+    if (!headerGetEntry(h, RPMTAG_FILENAMES, NULL, (void **) &mem->names, 
                        fileCountPtr))
-       headerGetEntry(h, RPMTAG_FILENAMES, NULL, (void **) &mem->names, 
-                          fileCountPtr);
+       return 0;
+
     if (!headerGetEntry(h, RPMTAG_ORIGFILENAMES, NULL, 
                        (void **) &mem->cpioNames, NULL))
        headerGetEntry(h, RPMTAG_FILENAMES, NULL, (void **) &mem->cpioNames, 
                           fileCountPtr);
+    headerRemoveEntry(h, RPMTAG_ORIGFILENAMES);
 
     fileCount = *fileCountPtr;