[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.3-52-gcd70e64



The following commit has been merged in the master branch:
commit cd70e64c44e0f4ba04ae4df880eec88e16145f6d
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Oct 9 13:18:28 2011 +0200

    Fixed some corner case issues for coll/{index,unpacked}
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/collection/debfiles b/collection/debfiles
index 4a14828..c468435 100755
--- a/collection/debfiles
+++ b/collection/debfiles
@@ -37,6 +37,9 @@ if (-e 'debfiles') {
         or fail('cannot rm old debfiles directory');
 }
 
+fail ("debian dir for $pkg is a symlink")
+    if -l 'unpacked/debian';
+
 # Copy the whole debian directory
 copy_dir('unpacked/debian/', 'debfiles')
     or fail("cannot copy unpacked/debian to debfiles: $!");
diff --git a/collection/index b/collection/index
index fc4dbba..0d2d351 100755
--- a/collection/index
+++ b/collection/index
@@ -145,6 +145,11 @@ sub index_src {
                 $prefix = '';
             }
         }
+        # Ensure $prefix is defined - this may appear to be redundant, but
+        # no tarballs are present (happens if you wget rather than dget
+        # the .dsc file >.>)
+        $prefix //= '';
+
         # If there is a common prefix and it is $compname, then we use that
         # becaues that is where they will be extracted by unpacked.
         if ($prefix ne $compname) {
diff --git a/debian/changelog b/debian/changelog
index e5f23f1..03279cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,12 @@ lintian (2.5.4) UNRELEASED; urgency=low
     + [JW] Improved the wording of the extra information for the tag
       syntax-error-in-dep5-copyright.  (Closes: #644556)
 
+  * collection/index:
+    + [NT] Fixed an "uninitialized variable" warning if no tarballs were
+      present.
+  * collcetion/debfiles:
+    + [NT] Bail if the debian dir is a symlink.
+
   * data/changelog-file/ubuntu-dists:
     + [NT] Added the "precise".  Thanks to Loïc Minier for the
       patch.  (Closes: #644488)

-- 
Debian package checker


Reply to: