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

[SCM] Debian package checker branch, master, updated. 2.2.5-18-gf8064af



The following commit has been merged in the master branch:
commit 352f207f4f6e8e3b75075f65d5338e56a14a255f
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Sat Feb 7 13:55:31 2009 -0600

    Improve virtual package list generation
    
    Fix an error where some packages where being excluded because of an
    unstripped line feed.

diff --git a/private/refresh-virtual-packages-data b/private/refresh-virtual-packages-data
index 6ee8915..f4911d0 100755
--- a/private/refresh-virtual-packages-data
+++ b/private/refresh-virtual-packages-data
@@ -88,23 +88,26 @@ EOF
     printf "# Keep: %s\n" "$VIRTUAL_PACKAGES" >> "$workdir/virtual-packages"
 }
 
+echo >> "$workdir/virtual-packages"
+
 if [ -z "$packages" ] ; then
     wget dists/sid/main/binary-i386/Packages.gz
     packages="$workdir/Packages.gz"
 fi
 
-{ zcat "$packages";
+{ zcat "$packages"
   sed -rn 's/^#\s*Keep:\s*/Provides: /;T;s/([^,:])\s+([^,])/\1, \2/g;p' \
 	"$workdir/virtual-packages"
 } |
     perl -w -E 'my %seen; while (<>) {
 		    next unless (s/^Provides:\s*//);
+		    chomp;
 		    for my $pkg (split /\s*,\s*/) {
 			$seen{$pkg}++;
 			print "$pkg\n"
 			    if ($seen{$pkg} eq 2);
 		    }
-		  };' \
+		  }' \
     | sort -u >> "$workdir/virtual-packages"
 
 mv "$workdir/virtual-packages" "$lintian_data/fields/"

-- 
Debian package checker


Reply to: