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

[SCM] Debian package checker branch, master, updated. 2.5.11-87-g38df054



The following commit has been merged in the master branch:
commit 38df05466e28ab6d08ef2e8f822f9bc570844b2e
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Jan 21 20:42:42 2013 +0100

    coll/index: Ensure dir names have a trailing slash
    
    Ensure directories in the source index have trailing slashes (as
    required by the L::Collect API).
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/collection/index b/collection/index
index ff08b4c..6808ddc 100755
--- a/collection/index
+++ b/collection/index
@@ -50,9 +50,12 @@ if ($type ne 'source') {
         or fail "chdir $dir/unpacked: $!";
     spawn ({ fail => 'error', out => "$dir/index.gz" },
            ['find', '(',  '-type', 'l',
-                   # If symlink
-                   '-printf', '%M 0/0 %s %AY-%Am-%Ad %AH:%AM %p -> %l\n', '-true',
-              # else symlink
+              # If symlink
+                '-printf', '%M 0/0 %s %AY-%Am-%Ad %AH:%AM %p -> %l\n', '-true',
+              # elif dir [needs trailing slash]
+              ')', '-o', '(',  '-type', 'd',
+                '-printf', '%M 0/0 %s %AY-%Am-%Ad %AH:%AM %p/\n', '-true',
+              # else (not dir and not symlink)
               ')', '-o', '-printf', '%M 0/0 %s %AY-%Am-%Ad %AH:%AM %p\n'],
            # Sort and compress
            '|', ['sort', '-k', '6'], '|', ['gzip', '-9c']);

-- 
Debian package checker


Reply to: