[pkg-bioc] svn commit r366 r366 - /trunk/tools-ng/deldoubles.pl

[smoe-guest at users.alioth.debian.org]

Author: smoe-guest
Date: Sun Dec  2 15:32:51 2007
New Revision: 366

URL: http://svn.debian.org/wsvn/pkg-bioc/?sc=1&rev=366
Log:
Smallish glitch fixed.

Modified:
    trunk/tools-ng/deldoubles.pl

Modified: trunk/tools-ng/deldoubles.pl
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/deldoubles.pl?rev=366&op=diff
==============================================================================
--- trunk/tools-ng/deldoubles.pl (original)
+++ trunk/tools-ng/deldoubles.pl Sun Dec  2 15:32:51 2007
@@ -47,7 +47,8 @@ sub versionComparison($$) {
 
 sub removeThemAll($$) {
     my ($packagename, $version)=@_;
-    my @debs = grep(/^r-([^-]+)-$packagename-$version/, at ary);
+    my $pattern="r-(cran|bioc|omegahat)-${packagename}_${version}";
+    my @debs = grep(/$pattern/, at ary);
     foreach my $d (@debs) {
     	print "d\n";
     }
@@ -77,6 +78,8 @@ foreach my $cur (@ary) {
     my ($packagename,$version)=$cur =~ /([^_]+)_(.*)(\.log|\.orig.tar.gz|-[^-]+)/;
 #    print STDERR "$packagename ($version)\n";
 
+    next if $cur =~ /^Packages/;
+
     if (!defined($packagename)) {
     	print STDERR "Could not parse '$cur' to retrieve package and version info.\n";
 	next;
@@ -122,7 +125,7 @@ foreach my $packagename (keys %packages)
 			removeThemAll($packagename,$v);
 		}
 	    }
-	    elsif (grep(/r-([^-]+)-$packagename-$v/, at ary)) {
+	    elsif (grep(/r-([^-]+)-${packagename}_${v}/, at ary)) {
 	    	$versionshashref->{versionToKeep}=$v;
 		print STDERR "Should be kept: $packagename version $v.\n";
 		next;
@@ -135,5 +138,6 @@ foreach my $packagename (keys %packages)
 		removeThemAll($packagename,$v);
 	    }
 	}
+	print STDERR "\n";
     }
 }