[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-309-g2ccd37b

[Guillem Jover]

The following commit has been merged in the master branch:
commit f3dcf914203a42c9080f128d7e8263e8a0fb7ffa
Author: Guillem Jover <guil...@debian.org>
Date:   Tue Sep 6 05:54:36 2011 +0200

    libdpkg: Rename trig_enqueue_awaited_pend to trig_awaited_pend_enqueue

diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c
index 124d2d4..cc844f1 100644
--- a/lib/dpkg/fields.c
+++ b/lib/dpkg/fields.c
@@ -573,6 +573,6 @@ f_trigaw(struct pkginfo *aw, struct pkgbin *pifp,
       parse_error(ps,
                   _("duplicate awaited trigger package `%.255s'"), word);
 
-    trig_enqueue_awaited_pend(pend);
+    trig_awaited_pend_enqueue(pend);
   }
 }
diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c
index 83bcbf0..121fb90 100644
--- a/lib/dpkg/triglib.c
+++ b/lib/dpkg/triglib.c
@@ -192,7 +192,7 @@ trig_clear_awaiters(struct pkginfo *notpend)
 static struct pkg_list *trig_awaited_pend_head;
 
 void
-trig_enqueue_awaited_pend(struct pkginfo *pend)
+trig_awaited_pend_enqueue(struct pkginfo *pend)
 {
        struct pkg_list *tp;
 
diff --git a/lib/dpkg/triglib.h b/lib/dpkg/triglib.h
index 250c241..96e52b5 100644
--- a/lib/dpkg/triglib.h
+++ b/lib/dpkg/triglib.h
@@ -83,7 +83,7 @@ bool trig_note_pend(struct pkginfo *pend, const char *trig 
/*not copied!*/);
 bool trig_note_aw(struct pkginfo *pend, struct pkginfo *aw);
 void trig_clear_awaiters(struct pkginfo *notpend);
 
-void trig_enqueue_awaited_pend(struct pkginfo *pend);
+void trig_awaited_pend_enqueue(struct pkginfo *pend);
 void trig_fixup_awaiters(enum modstatdb_rw cstatus);
 
 void trig_file_interests_ensure(void);

-- 
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