python: shared module needs -lrpm -lbz2.

CVS patchset: 3302
CVS date: 1999/09/17 22:59:31

CHANGES

@@ -50,6 +50,7 @@
 	- glibc2: always enable dynamic mtrace if available.
 	- fix: versioned provides devolved to existence test with conflicts.
 	- fix: with unspecified epochs, skip dependency epoch compare.
+	- python: shared module needs -lrpm -lbz2.
 
 3.0.1 -> 3.0.2
 	- eliminate armv4 entries from rpmrc (Andrew E. Mileski).

lib/install.c

@@ -299,7 +299,7 @@ static int installArchive(FD_t fd, struct fileInfo * files,
     int rc, i;
     struct cpioFileMapping * map = NULL;
     int mappedFiles = 0;
-    const char * failedFile;
+    const char * failedFile = NULL;
     struct callbackInfo info;
 
     if (!files) {
@@ -359,19 +359,21 @@ static int installArchive(FD_t fd, struct fileInfo * files,
 		(failedFile != NULL ? _(" on file ") : ""),
 		(failedFile != NULL ? failedFile : ""),
 		cpioStrerror(rc));
-	return 1;
-    }
-
-    if (notify) {
+	rc = 1;
+    } else if (notify) {
 	if (archiveSize)
 	    (void)notify(h, RPMCALLBACK_INST_PROGRESS, archiveSize, archiveSize,
 	       pkgKey, notifyData);
 	else
 	    (void)notify(h, RPMCALLBACK_INST_PROGRESS, 100, 100,
 		pkgKey, notifyData);
+	rc = 0;
     }
 
-    return 0;
+    if (failedFile)
+	xfree(failedFile);
+
+    return rc;
 }
 
 /* 0 success */

rpm.spec

@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.0.3
 Version: %{version}
-Release: 0.26
+Release: 0.27
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL

system.h

@@ -33,9 +33,7 @@
 /* <unistd.h> should be included before any preprocessor test
    of _POSIX_VERSION.  */
 #ifdef HAVE_UNISTD_H
-/*@-skipposixheaders@*/
 #include <unistd.h>
-/*@=skipposixheaders@*/
 #endif
 
 #if TIME_WITH_SYS_TIME