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

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

Author: smoe-guest
Date: Mon Dec  3 09:27:06 2007
New Revision: 367

URL: http://svn.debian.org/wsvn/pkg-bioc/?sc=1&rev=367
Log:
* added flag to use debootstrap instead of cdebootstrap.


Modified:
    trunk/tools-ng/CowBuilder.pm
    trunk/tools-ng/PBuilder.pm
    trunk/tools-ng/r_pkg_prepare.sh
    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=367&op=diff
==============================================================================
--- trunk/tools-ng/CowBuilder.pm (original)
+++ trunk/tools-ng/CowBuilder.pm Mon Dec  3 09:27:06 2007
@@ -50,6 +50,9 @@ sub CowBuilder_update () {
       . "--buildplace ${main::CowBuilder_BuildPlace} --override-config "
       . "--mirror http://ftp.${main::Lang}.debian.org/debian "
       . ${main::Builder_Post};
+    if ( defined($main::debootstrap) ) {
+        $buildercommand .= " --debootstrap ".$main::debootstrap." ";
+    }
     $buildercommand .= " --debootstrapopts --verbose" if ($main::verbose);
     $buildercommand .= " --debug --debootstrapopts  --debug" if ($main::debug);
     print "$buildercommand \n" if $main::verbose;

Modified: trunk/tools-ng/PBuilder.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/PBuilder.pm?rev=367&op=diff
==============================================================================
--- trunk/tools-ng/PBuilder.pm (original)
+++ trunk/tools-ng/PBuilder.pm Mon Dec  3 09:27:06 2007
@@ -34,6 +34,9 @@ sub PBuilder_update () {
     if ( ( !-f $main::PBuilder_Base ) || ( !-s $main::PBuilder_Base ) ) {
 	print "Creating new file '$main::PBuilder_Base'.\n" if $main::verbose;
         $buildercommand .= "--create ";
+        if ( defined($main::debootstrap) ) {
+            $buildercommand .= " --debootstrap ".$main::debootstrap." ";
+        }
     }
     else {
 	print "UPdating file '$main::PBuilder_Base'.\n" if $main::verbose;
@@ -82,12 +85,14 @@ sub PBuilder_check () {
 }
 
 sub PBuilder_dependencies () {
-    $main::needpackagebefore->{'debhelper'}  = "nop";
-    $main::needpackagebefore->{'devscripts'} = "nop";
+    #$main::needpackagebefore->{'debhelper'}  = "nop";
+    #$main::needpackagebefore->{'devscripts'} = "nop";
     $main::needpackagebefore->{'pbuilder'}   = "nop";
 
 # special case : for lenny, we need at least cdebootstrap >= 0.4.3 --psychedelys
+    if (defined($main::debootstrap) and "cdebootstrap" eq $main::debootstrap) {
     $main::needpackagebefore->{'cdebootstrap'} = "0.4.3";
+    }
     $main::needpackagebefore->{'sudo'}         = "nop";
 }
 

Modified: trunk/tools-ng/r_pkg_prepare.sh
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/r_pkg_prepare.sh?rev=367&op=diff
==============================================================================
--- trunk/tools-ng/r_pkg_prepare.sh (original)
+++ trunk/tools-ng/r_pkg_prepare.sh Mon Dec  3 09:27:06 2007
@@ -36,7 +36,7 @@ installMethods="PBuilder"
 
 hostname="pc171.inb.uni-luebeck.de"
 
-accessLocalFilesByHttp=1
+#accessLocalFilesByHttp=1
 
 ### END TO EDIT, START MODE READ-ONLY!!!
 

Modified: trunk/tools-ng/r_pkg_update.pl
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/r_pkg_update.pl?rev=367&op=diff
==============================================================================
--- trunk/tools-ng/r_pkg_update.pl (original)
+++ trunk/tools-ng/r_pkg_update.pl Mon Dec  3 09:27:06 2007
@@ -91,6 +91,10 @@ This script will be executed under Debia
    create|update the $installmethods_builder image.
    Need to have $installmethods_pbuilder in the sudo authorisation!
 
+=item --debootstrap (debootstrap|cdebootstrap)
+
+   Parameter passed to pbuilder when creating the base.tgz.
+
 =back
 
 =head1 SEE ALSO 
@@ -108,7 +112,7 @@ use Cwd;
 use vars qw($help $man $debug $verbose $dryrun $VERSION);
 
 #the specific variables
-use vars qw($doupdate $dotagupdate $dobuilderupdate);
+use vars qw($doupdate $dotagupdate $dobuilderupdate $debootstrap);
 
 my $origpath = cwd;
 
@@ -168,6 +172,7 @@ my %options = (
     "doupdate"        => \$doupdate,
     "dotagupdate"     => \$dotagupdate,
     "dobuilderupdate" => \$dobuilderupdate,
+    "debootstrap:s" => \$debootstrap
 );
 
 help() if !GetOptions(%options) or $help or $man;
@@ -195,6 +200,8 @@ use vars qw(
   $currentpackage
 );
 
+$debootstrap="debootstrap" unless defined($debootstrap);
+
 my $RepositoryList = ();
 use vars qw( $needpackagebefore );