dpkg: Use package specifiers in statusfd and log messages

The colon is often used as a separator but it is always preceded and/or
followed by a space so that it's possible to distinguish between the
colon used as a separator and the colon embedded in a package name
(like in "libc6:amd64").

Based-on-patch-by: Raphaël Hertzog <hertzog@debian.org>
Patch-sponsored-by: Linaro Limited

Signed-off-by: Guillem Jover <guillem@debian.org>

lib/dpkg/dbmodify.c

@@ -407,9 +407,11 @@ void modstatdb_note(struct pkginfo *pkg) {
     pkg->trigaw.head = pkg->trigaw.tail = NULL;
   }
 
-  log_message("status %s %s %s", statusinfos[pkg->status].name, pkg->set->name,
+  log_message("status %s %s %s", statusinfos[pkg->status].name,
+              pkg_name(pkg, pnaw_always),
 	      versiondescribe(&pkg->installed.version, vdew_nonambig));
-  statusfd_send("status: %s: %s", pkg->set->name, statusinfos[pkg->status].name);
+  statusfd_send("status: %s: %s", pkg_name(pkg, pnaw_nonambig),
+                statusinfos[pkg->status].name);
 
   if (cstatus >= msdbrw_write)
     modstatdb_note_core(pkg);

src/help.c

@@ -653,8 +653,9 @@ void ensure_pathname_nonexisting(const char *pathname) {
 void
 log_action(const char *action, struct pkginfo *pkg, struct pkgbin *pkgbin)
 {
-  log_message("%s %s %s %s", action, pkg->set->name,
+  log_message("%s %s %s %s", action, pkgbin_name(pkg, pkgbin, pnaw_always),
 	      versiondescribe(&pkg->installed.version, vdew_nonambig),
 	      versiondescribe(&pkg->available.version, vdew_nonambig));
-  statusfd_send("processing: %s: %s", action, pkg->set->name);
+  statusfd_send("processing: %s: %s", action,
+                pkgbin_name(pkg, pkgbin, pnaw_nonambig));
 }

src/packages.c

@@ -232,7 +232,8 @@ void process_queue(void) {
         return;
       continue;
     }
-    push_error_context_jump(&ejbuf, print_error_perpackage, pkg->set->name);
+    push_error_context_jump(&ejbuf, print_error_perpackage,
+                            pkg_name(pkg, pnaw_nonambig));
 
     switch (action_todo) {
     case act_triggers:

src/trigproc.c

@@ -120,7 +120,7 @@ trigproc_run_deferred(void)
 			continue;
 		}
 		push_error_context_jump(&ejbuf, print_error_perpackage,
-		                        pkg->set->name);
+		                        pkg_name(pkg, pnaw_nonambig));
 
 		pkg->clientdata->trigprocdeferred = NULL;
 		trigproc(pkg);
@@ -292,7 +292,7 @@ check_trigger_cycle(struct pkginfo *processing_now)
 	pkg_set_status(giveup, stat_halfconfigured);
 	modstatdb_note(giveup);
 	print_error_perpackage(_("triggers looping, abandoned"),
-	                       giveup->set->name);
+	                       pkg_name(giveup, pnaw_nonambig));
 
 	return giveup;
 }