[pkg-bioc] svn commit r370 r370 - in /trunk: tools-ng/pkgbioc.pm tools-ng/r_pkg_ordering.pl tools/r_pkg_prepare.sh tools/r_pkg_upload.pl

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

Author: smoe-guest
Date: Sun Dec 16 22:34:48 2007
New Revision: 370

URL: http://svn.debian.org/wsvn/pkg-bioc/?sc=1&rev=370
Log:
Corrections to previous quick submission.

Deleted two files in previous tools folder.


Removed:
    trunk/tools/r_pkg_prepare.sh
    trunk/tools/r_pkg_upload.pl
Modified:
    trunk/tools-ng/pkgbioc.pm
    trunk/tools-ng/r_pkg_ordering.pl

Modified: trunk/tools-ng/pkgbioc.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/pkgbioc.pm?rev=370&op=diff
==============================================================================
--- trunk/tools-ng/pkgbioc.pm (original)
+++ trunk/tools-ng/pkgbioc.pm Sun Dec 16 22:34:48 2007
@@ -304,7 +304,7 @@ sub populate_source($$$$$) {
 
 	if (defined($main::pattern) and "" != $main::pattern) {
 		if ($cur =~ /$main::pattern/i) {
-			print STDERR "Accepting $cur.\n" if $verbose;
+			print STDERR "Accepting $cur.\n" if $main::verbose;
 		}
 		else {
 			print STDERR "Omitting source $cur (since not /$main::pattern/i)\n" if $main::verbose;
@@ -356,9 +356,9 @@ sub populate_description($$$$$$) {
     foreach my $cur (@ary) {
         next unless defined($cur);
         my $bfile = basename($cur);
-	if (defined($main::pattern) and "" != $pattern) {
+	if (defined($main::pattern) and "" != $main::pattern) {
 		if ($cur =~ /$main::pattern/i) {
-			print STDERR "Accepting $cur.\n" if $verbose;
+			print STDERR "Accepting $cur.\n" if $main::verbose;
 		}
 		else {
 			print STDERR "Omitting description $cur (since not /$main::pattern/i)\n" if $main::verbose;
@@ -592,14 +592,12 @@ sub adddependencies ($$$$$$) {
                 push(
                     @{ $packagehashref->{debiandependencies} },
                     "r-recommended"
-                  )
-                  unless grep( /\br-recommended\b/i,
+                  ) unless grep( /\br-recommended\b/i,
                     @{ $packagehashref->{debiandependencies} } );
                 push(
                     @{ $packagehashref->{debianbuilddependencies} },
                     "r-recommended"
-                  )
-                  unless grep( /\br-recommended\b/i,
+                  ) unless grep( /\br-recommended\b/i,
                     @{ $packagehashref->{debianbuilddependencies} } );
 
             }
@@ -749,9 +747,10 @@ sub adddependencies ($$$$$$) {
 
             }
             else {
-                print STDERR
-                  "$package: unknown package $pkg. This package is currently "
-                  . "in none of our known mirrors. So I am making it unbuildable.\n";
+                print STDERR "$package: unknown package $pkg. "
+		  . "This package is currently "
+                  . "in none of our known mirrors. "
+		  . "So I am making it unbuildable.\n";
                 push(
                     @{ $global->{cannotbuild}->{$package} },
                     "unknown dependencies $pkg"

Modified: trunk/tools-ng/r_pkg_ordering.pl
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/r_pkg_ordering.pl?rev=370&op=diff
==============================================================================
--- trunk/tools-ng/r_pkg_ordering.pl (original)
+++ trunk/tools-ng/r_pkg_ordering.pl Sun Dec 16 22:34:48 2007
@@ -599,7 +599,7 @@ foreach my $package (@nodes) {
     }
 
     unless (exists($packagehashref->{DebDir})) {
-       print "Mysterious error: \packagehashref->{DebDir} is undefined. Skipping package $package.\n";
+       print "Mysterious error: packagehashref->{DebDir} is undefined. Skipping package $package.\n";
        next;
     }
 
@@ -748,14 +748,14 @@ foreach my $package (@nodes) {
 
     }
     elsif ( -s $debfile ) {
-        print "\t$package is already built, $debfile exists";
+        print "\t$package is already built, $debfile exists"
           if $verbose;
         if ($rebuildlocal) {
             print ", but rebuilding anyway as requested.\n";
             unlink $debfile if ( !$dryrun );
         }
         else {
-	    print ", skipped.\n"
+	    print ", skipped.\n";
             next;
         }
     }