[pkg-bioc] svn commit r357 r357 - in /trunk/tools-ng: CowBuilder.pm PBuilder.pm r_pkg_update.pl

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

Author: psychedelys-guest
Date: Mon Nov 12 20:45:36 2007
New Revision: 357

URL: http://svn.debian.org/wsvn/pkg-bioc/?sc=1&rev=357
Log:
some minor patch : sudo test in cowbuilder, and r_pkg_update is using bioccurrent, so we have 1 constant less in the code

Modified:
    trunk/tools-ng/CowBuilder.pm
    trunk/tools-ng/PBuilder.pm
    trunk/tools-ng/r_pkg_update.pl

Modified: trunk/tools-ng/CowBuilder.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/CowBuilder.pm?rev=357&op=diff
==============================================================================
--- trunk/tools-ng/CowBuilder.pm (original)
+++ trunk/tools-ng/CowBuilder.pm Mon Nov 12 20:45:36 2007
@@ -19,6 +19,9 @@ my $name = "CowBuilder";
 
 # Create|update the cowpuilder image used for the build
 sub CowBuilder_update () {
+    if ( !( -x "/bin/sudo" ) or ( -x "/usr/bin/sudo" ) ) {
+        die "Expected '/bin/sudo' or '/usr/bin/sudo'.\n";
+    }
     my $buildercommand = "sudo cowbuilder ";
     die "${name}_Base is undefined, please read the documentation\n"
       unless ( defined($main::CowBuilder_Base)

Modified: trunk/tools-ng/PBuilder.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/PBuilder.pm?rev=357&op=diff
==============================================================================
--- trunk/tools-ng/PBuilder.pm (original)
+++ trunk/tools-ng/PBuilder.pm Mon Nov 12 20:45:36 2007
@@ -109,7 +109,7 @@ sub PBuilder_build ($) {
       . "--buildsourceroot fakeroot "
       . "--pbuilderroot sudo "
       . "--logfile ../../$pkg->{logfile} "
-      . "--buildresult ../../$main::PBuilder_Result " . "-- "
+      . "--buildresult ../../$main::Builder_Result " . "-- "
       . "--basetgz ../../${main::PBuilder_Base} "
       . "--buildplace ../../${main::PBuilder_BuildPlace} "
       . ${main::Builder_Post}

Modified: trunk/tools-ng/r_pkg_update.pl
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/r_pkg_update.pl?rev=357&op=diff
==============================================================================
--- trunk/tools-ng/r_pkg_update.pl (original)
+++ trunk/tools-ng/r_pkg_update.pl Mon Nov 12 20:45:36 2007
@@ -199,7 +199,7 @@ my $RepositoryList = ();
 use vars qw( $needpackagebefore );
 
 # auto Load the values of variables from the files.
-sub loadfile {
+sub loadfile () {
     die "Variable File not found: $autogeneratevariable. Did you run "
       . "r_pkg_prepare ??"
       if ( !-f $autogeneratevariable );
@@ -450,19 +450,7 @@ sub updaterepository($) {
                 ["R"], "src/contrib", $superdebug );
         }
     }
-    elsif ( "bioc-2.0" eq $repository ) {
-        if ( !$dryrun ) {
-            print "Updating $repository\n" if $verbose;
-            &R_update(
-                "../$repository/sources",
-                "http://bioconductor.org/packages/2.0",
-                [ "bioc", "data/annotation", "data/experiment", "extra" ],
-                "src/contrib",
-                $superdebug
-            );
-        }
-    }
-    elsif ( "bioc-2.1" eq $repository ) {
+    elsif ( $bioccurrent eq $repository ) {
         if ( !$dryrun ) {
             print "Updating $repository\n" if $verbose;
             &R_update(