[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-65-gff6e32d

[Guillem Jover]

The following commit has been merged in the master branch:
commit fda21f829bebed12e1a4ec0dccac7434a643c6b5
Author: Guillem Jover <guil...@debian.org>
Date:   Fri May 6 05:05:51 2011 +0200

    dpkg: Rename hasdirectoryconffiles() to dir_has_conffiles()

diff --git a/src/help.c b/src/help.c
index e0fefae..8f6a2fc 100644
--- a/src/help.c
+++ b/src/help.c
@@ -465,12 +465,12 @@ void clear_istobes(void) {
  * false otherwise.
  */
 bool
-hasdirectoryconffiles(struct filenamenode *file, struct pkginfo *pkg)
+dir_has_conffiles(struct filenamenode *file, struct pkginfo *pkg)
 {
   struct conffile *conff;
   size_t namelen;
 
-  debug(dbg_veryverbose, "hasdirectoryconffiles `%s' (from %s)", file->name,
+  debug(dbg_veryverbose, "dir_has_conffiles '%s' (from %s)", file->name,
        pkg->name);
   namelen = strlen(file->name);
   for (conff= pkg->installed.conffiles; conff; conff= conff->next) {
@@ -481,7 +481,7 @@ hasdirectoryconffiles(struct filenamenode *file, struct 
pkginfo *pkg)
        return true;
       }
   }
-  debug(dbg_veryverbose, "hasdirectoryconffiles no");
+  debug(dbg_veryverbose, "dir_has_conffiles no");
   return false;
 }
 
diff --git a/src/main.h b/src/main.h
index cba98ef..177fb1c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -249,7 +249,7 @@ void post_postinst_tasks(struct pkginfo *pkg, enum 
pkgstatus new_status);
 
 void clear_istobes(void);
 bool isdirectoryinuse(struct filenamenode *namenode, struct pkginfo *pkg);
-bool hasdirectoryconffiles(struct filenamenode *namenode, struct pkginfo *pkg);
+bool dir_has_conffiles(struct filenamenode *namenode, struct pkginfo *pkg);
 
 void log_action(const char *action, struct pkginfo *pkg);
 
diff --git a/src/remove.c b/src/remove.c
index 3d4879b..ac57dd2 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -253,7 +253,7 @@ removal_bulk_remove_files(struct pkginfo *pkg)
         /* Only delete a directory or a link to one if we're the only
          * package which uses it. Other files should only be listed
          * in this package (but we don't check). */
-       if (hasdirectoryconffiles(namenode,pkg)) {
+        if (dir_has_conffiles(namenode, pkg)) {
          push_leftover(&leftover,namenode);
          continue;
        }
@@ -332,7 +332,7 @@ static void removal_bulk_remove_leftover_dirs(struct 
pkginfo *pkg) {
       /* Only delete a directory or a link to one if we're the only
        * package which uses it. Other files should only be listed
        * in this package (but we don't check). */
-      if (hasdirectoryconffiles(namenode,pkg)) {
+      if (dir_has_conffiles(namenode, pkg)) {
        push_leftover(&leftover,namenode);
        continue;
       }

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