[pkg-bioc] svn commit r358 r358 - in /branches/tools-ng: CowBuilder.pm PBuilder.pm pkgbioc.pm r_pkg_prepare.sh r_pkg_update.pl storage.pm

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

Author: psychedelys-guest
Date: Mon Nov 12 20:55:02 2007
New Revision: 358

URL: http://svn.debian.org/wsvn/pkg-bioc/?sc=1&rev=358
Log:
merging back to the devel branch the commit -r354:357 

Modified:
    branches/tools-ng/CowBuilder.pm
    branches/tools-ng/PBuilder.pm
    branches/tools-ng/pkgbioc.pm
    branches/tools-ng/r_pkg_prepare.sh
    branches/tools-ng/r_pkg_update.pl
    branches/tools-ng/storage.pm

Modified: branches/tools-ng/CowBuilder.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/branches/tools-ng/CowBuilder.pm?rev=358&op=diff
==============================================================================
--- branches/tools-ng/CowBuilder.pm (original)
+++ branches/tools-ng/CowBuilder.pm Mon Nov 12 20:55:02 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)
@@ -59,7 +62,7 @@ sub CowBuilder_update () {
 }
 
 sub CowBuilder_check() {
-    die "You need to first create the $name base"
+    die "You need to first create the $name base.\n"
       . "Something goes wrong during the deployement of your"
       . " $name base (empty base file)\n"
       . " Please try again to read carrefully the instruction"

Modified: branches/tools-ng/PBuilder.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/branches/tools-ng/PBuilder.pm?rev=358&op=diff
==============================================================================
--- branches/tools-ng/PBuilder.pm (original)
+++ branches/tools-ng/PBuilder.pm Mon Nov 12 20:55:02 2007
@@ -24,6 +24,9 @@ sub PBuilder_update () {
 # pbuilder create --debootstrap debootstrap --debootstrapopts --keyring=/etc/apt/trusted.gpg
 # need to pass those option to verify the deb package inside the pbuilder
 # http://wiki.debian.org/SecurePbuilder
+    if ( !( -x "/bin/sudo" ) or ( -x "/usr/bin/sudo" ) ) {
+        die "Expected '/bin/sudo' or '/usr/bin/sudo'.\n";
+    }
     my $buildercommand = "sudo pbuilder ";
     die "${name}_Base is undefined, please read the documentation\n"
       unless ( defined($main::PBuilder_Base)
@@ -106,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: branches/tools-ng/pkgbioc.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/branches/tools-ng/pkgbioc.pm?rev=358&op=diff
==============================================================================
--- branches/tools-ng/pkgbioc.pm (original)
+++ branches/tools-ng/pkgbioc.pm Mon Nov 12 20:55:02 2007
@@ -175,7 +175,10 @@ sub check_requierment ($$$$$$) {
             }
         }
     }
-    die "ERROR please correct the $errors error(s) below\n" if ($errors);
+    die "ERROR please correct the $errors error"
+      . ( $errors > 1 ? "s" : "" )
+      . " above.\n"
+      if ($errors);
 }
 
 #check the directory structures, in theory not need, but well you never known!

Modified: branches/tools-ng/r_pkg_prepare.sh
URL: http://svn.debian.org/wsvn/pkg-bioc/branches/tools-ng/r_pkg_prepare.sh?rev=358&op=diff
==============================================================================
--- branches/tools-ng/r_pkg_prepare.sh (original)
+++ branches/tools-ng/r_pkg_prepare.sh Mon Nov 12 20:55:02 2007
@@ -32,6 +32,7 @@
 # Be Warm that the name given here must match a pm file
 # Are actually working : PBuilder CowBuilder
 installMethods="CowBuilder"
+#installMethods="PBuilder"
 
 # SQL parameters :
 
@@ -121,6 +122,11 @@ webdir="../web"
 Lang=""
 ### END - STUFF that we export - END ###
 
+if [ -x "/usr/bin/sudo" ] ; then
+	echo "sudo is not installed which is required for both CowBuilder and PBuilder!"
+	exit -1;
+fi
+
 HELP=NO
 EU=NO
 US=NO

Modified: branches/tools-ng/r_pkg_update.pl
URL: http://svn.debian.org/wsvn/pkg-bioc/branches/tools-ng/r_pkg_update.pl?rev=358&op=diff
==============================================================================
--- branches/tools-ng/r_pkg_update.pl (original)
+++ branches/tools-ng/r_pkg_update.pl Mon Nov 12 20:55:02 2007
@@ -460,7 +460,7 @@ sub updaterepository($) {
                 ["R"], "src/contrib", $superdebug );
         }
     }
-    elsif ( "bioc-2.1" eq $repository ) {
+    elsif ( $bioccurrent eq $repository ) {
 
         # TODO: hard coded values
         if ( !$dryrun ) {

Modified: branches/tools-ng/storage.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/branches/tools-ng/storage.pm?rev=358&op=diff
==============================================================================
--- branches/tools-ng/storage.pm (original)
+++ branches/tools-ng/storage.pm Mon Nov 12 20:55:02 2007
@@ -854,7 +853,7 @@ sub finish_store_description($) {
     $hash->{getid}->finish();
     $hash->{getrepoid}->finish();
     $hash->{getreponame}->finish();
-    $hash->{pkgid}->finish();
+    $hash->{pkgexist}->finish();
     $hash->{pkgneedupdate}->finish();
 
     $hash->{packagesname}->{sthselect}->finish();