pkg-kde: commit - rev 39 - people/jd/scripts

[David Pashley]

Author: jd-guest
Date: 2004-02-17 01:25:35 +0100 (Tue, 17 Feb 2004)
New Revision: 39

Modified:
   people/jd/scripts/check-replaces
Log:
 * Include checking on symlinks (actually do not check directories instead
   of only checking files)
 * Print out files that conflict by default
 * Some work of checking the regex for contents.gz is right. This file
   is a pita.


Modified: people/jd/scripts/check-replaces
===================================================================
--- people/jd/scripts/check-replaces    2004-02-16 21:03:17 UTC (rev 38)
+++ people/jd/scripts/check-replaces    2004-02-17 00:25:35 UTC (rev 39)
@@ -69,7 +69,7 @@
 sub wanted { # {{{
    if (my ($package,$file) = $File::Find::name =~ m|debian/(.*?)/(.*)|) {
       return if $file =~ m/^DEBIAN/;
-      return unless -f "$dir/$File::Find::name"; 
+      return if -d "$dir/$File::Find::name"; 
       if (exists $filelist{$file}) { 
          print STDERR "$file is in $package and " .$filelist{$file} ."\n"; 
       } else {
@@ -93,14 +93,14 @@
    while (my $line = <ZCAT>){
       ($file) = $line =~ m/^(.*?)\s/;
       if (exists $filelist{$file}) {
-         ($file, $packages) = $line =~ m/^(.*?)\s+(.*)$/;
+         ($file, $packages) = $line =~ m/^(\S*)\s+(\S+)$/;
          my @packages;
          for my $package (split /,/, $packages) {
             $package =~ s#^.*/##;
             push @packages,  $package;
          }
          if (@packages = grep !/\Q$filelist{$file}\E/, @packages) {
-            #print $filelist{$file} . " conflicts with ". join (', ', 
@packages) . " $file\n";
+            print $filelist{$file} . " conflicts with ". join (', ', 
@packages) . " $file\n";
             for my $package (@packages) {
                ${ $conflicts{ $filelist{$file} } }->{$package} = $dist;
             }