Merge branch 'busybox' into merge

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
                                 if (result && number_of_alternatives == 0) {
                                         if (root_of_alternatives)
                                                 bb_error_msg_and_die(
-                                                        "package %s %sdepends on %s, "
-                                                        "which cannot be satisfied",
+                                                        "package %s %sdepends on %s, which %s",
                                                         name_hashtable[package_node->name],
                                                         package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "",
-                                                        name_hashtable[root_of_alternatives->name]);
+                                                        name_hashtable[root_of_alternatives->name],
+                                                        "cannot be satisfied");
                                         bb_error_msg_and_die(
-                                                "package %s %sdepends on %s, which %s\n",
+                                                "package %s %sdepends on %s, which %s",
                                                 name_hashtable[package_node->name],
                                                 package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "",
                                                 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)
                         bb_error_msg_and_die("'%s' returned status %d",
                                 archive_handle->tar__to_command, WEXITSTATUS(status));
                 if (WIFSIGNALED(status))
-                        bb_error_msg_and_die("'%s' terminated on signal %d",
+                        bb_error_msg_and_die("'%s' terminated by signal %d",
                                 archive_handle->tar__to_command, WTERMSIG(status));
 
                 if (!BB_MMU) {