aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-03-29 19:42:19 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-03-29 19:42:19 +0000
commit53f83d68fb0e7a12b819f91e21bb85917de6e09a (patch)
treef319f5d94452a703f1dab5d1025ca3d7f1e34768
parent5e43d8591b50905e8bef8b30984b7633bcdf07ad (diff)
downloadbusybox-w32-53f83d68fb0e7a12b819f91e21bb85917de6e09a.tar.gz
busybox-w32-53f83d68fb0e7a12b819f91e21bb85917de6e09a.tar.bz2
busybox-w32-53f83d68fb0e7a12b819f91e21bb85917de6e09a.zip
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@bluegiga.com>)
-rw-r--r--archival/dpkg.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 0a42deb39..c64410096 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1306,14 +1306,12 @@ static void remove_package(const unsigned package_num, int noisy)
1306 char **exclude_files; 1306 char **exclude_files;
1307 char list_name[package_name_length + 25]; 1307 char list_name[package_name_length + 25];
1308 char conffile_name[package_name_length + 30]; 1308 char conffile_name[package_name_length + 30];
1309 int return_value;
1310 1309
1311 if (noisy) 1310 if (noisy)
1312 printf("Removing %s (%s)...\n", package_name, package_version); 1311 printf("Removing %s (%s)...\n", package_name, package_version);
1313 1312
1314 /* run prerm script */ 1313 /* run prerm script */
1315 return_value = run_package_script(package_name, "prerm"); 1314 if (run_package_script(package_name, "prerm") != 0) {
1316 if (return_value == -1) {
1317 bb_error_msg_and_die("script failed, prerm failure"); 1315 bb_error_msg_and_die("script failed, prerm failure");
1318 } 1316 }
1319 1317
@@ -1381,8 +1379,8 @@ static void purge_package(const unsigned package_num)
1381 free(exclude_files); 1379 free(exclude_files);
1382 1380
1383 /* run postrm script */ 1381 /* run postrm script */
1384 if (run_package_script(package_name, "postrm") == -1) { 1382 if (run_package_script(package_name, "postrm") != 0) {
1385 bb_error_msg_and_die("postrm fialure.. set status to what?"); 1383 bb_error_msg_and_die("postrm failure.. set status to what?");
1386 } 1384 }
1387 1385
1388 /* Change package status */ 1386 /* Change package status */