diff options
Diffstat (limited to 'archival/dpkg.c')
| -rw-r--r-- | archival/dpkg.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c index ddb5daf09..da77fba05 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c @@ -487,7 +487,7 @@ static void add_split_dependencies(common_node_t *parent_node, const char *whole } else if (strncmp(version, ">=", offset_ch) == 0) { edge->operator = VER_MORE_EQUAL; } else { - bb_error_msg_and_die("illegal operator"); + bb_simple_error_msg_and_die("illegal operator"); } } /* skip to start of version numbers */ @@ -730,7 +730,7 @@ static void set_status(const unsigned status_node_num, const char *new_value, co status = new_value_num; break; default: - bb_error_msg_and_die("DEBUG ONLY: this shouldnt happen"); + bb_simple_error_msg_and_die("DEBUG ONLY: this shouldnt happen"); } new_status = xasprintf("%s %s %s", name_hashtable[want], name_hashtable[flag], name_hashtable[status]); @@ -944,10 +944,10 @@ static void write_status_file(deb_file_t **deb_file) /* Create a separate backfile to dpkg */ if (rename("/var/lib/dpkg/status", "/var/lib/dpkg/status.udeb.bak") == -1) { if (errno != ENOENT) - bb_error_msg_and_die("can't create backup status file"); + bb_simple_error_msg_and_die("can't create backup status file"); /* Its ok if renaming the status file fails because status * file doesn't exist, maybe we are starting from scratch */ - bb_error_msg("no status file found, creating new one"); + bb_simple_error_msg("no status file found, creating new one"); } xrename("/var/lib/dpkg/status.udeb", "/var/lib/dpkg/status"); @@ -1816,7 +1816,7 @@ int dpkg_main(int argc UNUSED_PARAM, char **argv) init_archive_deb_control(archive_handle); deb_file[deb_count]->control_file = deb_extract_control_file_to_buffer(archive_handle, control_list); if (deb_file[deb_count]->control_file == NULL) { - bb_error_msg_and_die("can't extract control file"); + bb_simple_error_msg_and_die("can't extract control file"); } deb_file[deb_count]->filename = xstrdup(argv[0]); package_num = fill_package_struct(deb_file[deb_count]->control_file); @@ -1879,13 +1879,13 @@ int dpkg_main(int argc UNUSED_PARAM, char **argv) argv++; } if (!deb_count) - bb_error_msg_and_die("no package files specified"); + bb_simple_error_msg_and_die("no package files specified"); deb_file[deb_count] = NULL; /* Check that the deb file arguments are installable */ if (!(opt & OPT_force_ignore_depends)) { if (!check_deps(deb_file, 0 /*, deb_count*/)) { - bb_error_msg_and_die("dependency check failed"); + bb_simple_error_msg_and_die("dependency check failed"); } } |