[SCM] dpkg's main repository branch, master, updated. 1.16.1.2-322-g9269cfc

[Guillem Jover]

The following commit has been merged in the master branch:
commit 1a34570e755a93ecc7b9bf87b9f5e99c187b6dda
Author: Guillem Jover <guil...@debian.org>
Date:   Wed Mar 2 09:12:11 2011 +0100

    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 <hert...@debian.org>
    Patch-sponsored-by: Linaro Limited
    
    Signed-off-by: Guillem Jover <guil...@debian.org>

diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c
index 6f74406..540d481 100644
--- a/lib/dpkg/dbmodify.c
+++ b/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);
diff --git a/src/help.c b/src/help.c
index ae7e352..872c07d 100644
--- a/src/help.c
+++ b/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));
 }
diff --git a/src/packages.c b/src/packages.c
index 8764829..4c1a44f 100644
--- a/src/packages.c
+++ b/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:
diff --git a/src/trigproc.c b/src/trigproc.c
index 5f8fa63..073a18c 100644
--- a/src/trigproc.c
+++ b/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;
 }

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org