svn commit: trunk/busybox/archival

vda at busybox.net vda at busybox.net
Thu Mar 29 19:42:19 UTC 2007


Author: vda
Date: 2007-03-29 12:42:19 -0700 (Thu, 29 Mar 2007)
New Revision: 18278

Log:
dpkg: run_package_script() returns 0 if all ok and non-zero if failure.
The result code was checked incorrectly in two places.
(from "Kim B. Heino" <Kim.Heino at bluegiga.com>)


Modified:
   trunk/busybox/archival/dpkg.c


Changeset:
Modified: trunk/busybox/archival/dpkg.c
===================================================================
--- trunk/busybox/archival/dpkg.c	2007-03-29 19:29:32 UTC (rev 18277)
+++ trunk/busybox/archival/dpkg.c	2007-03-29 19:42:19 UTC (rev 18278)
@@ -1306,14 +1306,12 @@
 	char **exclude_files;
 	char list_name[package_name_length + 25];
 	char conffile_name[package_name_length + 30];
-	int return_value;
 
 	if (noisy)
 		printf("Removing %s (%s)...\n", package_name, package_version);
 
 	/* run prerm script */
-	return_value = run_package_script(package_name, "prerm");
-	if (return_value == -1) {
+	if (run_package_script(package_name, "prerm") != 0) {
 		bb_error_msg_and_die("script failed, prerm failure");
 	}
 
@@ -1381,8 +1379,8 @@
 	free(exclude_files);
 
 	/* run postrm script */
-	if (run_package_script(package_name, "postrm") == -1) {
-		bb_error_msg_and_die("postrm fialure.. set status to what?");
+	if (run_package_script(package_name, "postrm") != 0) {
+		bb_error_msg_and_die("postrm failure.. set status to what?");
 	}
 
 	/* Change package status */




More information about the busybox-cvs mailing list