aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
Diffstat (limited to 'archival')
-rw-r--r--archival/dpkg.c8
-rw-r--r--archival/libarchive/data_extract_to_command.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 151f0ca43..df7a0db64 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1151,13 +1151,13 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
1151 if (result && number_of_alternatives == 0) { 1151 if (result && number_of_alternatives == 0) {
1152 if (root_of_alternatives) 1152 if (root_of_alternatives)
1153 bb_error_msg_and_die( 1153 bb_error_msg_and_die(
1154 "package %s %sdepends on %s, " 1154 "package %s %sdepends on %s, which %s",
1155 "which cannot be satisfied",
1156 name_hashtable[package_node->name], 1155 name_hashtable[package_node->name],
1157 package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "", 1156 package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "",
1158 name_hashtable[root_of_alternatives->name]); 1157 name_hashtable[root_of_alternatives->name],
1158 "cannot be satisfied");
1159 bb_error_msg_and_die( 1159 bb_error_msg_and_die(
1160 "package %s %sdepends on %s, which %s\n", 1160 "package %s %sdepends on %s, which %s",
1161 name_hashtable[package_node->name], 1161 name_hashtable[package_node->name],
1162 package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "", 1162 package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "",
1163 name_hashtable[package_edge->name], 1163 name_hashtable[package_edge->name],
diff --git a/archival/libarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c
index 5b32c2ec8..6f5317a0e 100644
--- a/archival/libarchive/data_extract_to_command.c
+++ b/archival/libarchive/data_extract_to_command.c
@@ -118,7 +118,7 @@ void FAST_FUNC data_extract_to_command(archive_handle_t *archive_handle)
118 bb_error_msg_and_die("'%s' returned status %d", 118 bb_error_msg_and_die("'%s' returned status %d",
119 archive_handle->tar__to_command, WEXITSTATUS(status)); 119 archive_handle->tar__to_command, WEXITSTATUS(status));
120 if (WIFSIGNALED(status)) 120 if (WIFSIGNALED(status))
121 bb_error_msg_and_die("'%s' terminated on signal %d", 121 bb_error_msg_and_die("'%s' terminated by signal %d",
122 archive_handle->tar__to_command, WTERMSIG(status)); 122 archive_handle->tar__to_command, WTERMSIG(status));
123 123
124 if (!BB_MMU) { 124 if (!BB_MMU) {