[pkg-bioc] svn commit r326 r326 - in /trunk/tools-ng: pkgbioc.pm r_pkg_ordering.pl

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

Author: psychedelys-guest
Date: Sat Sep 29 15:33:50 2007
New Revision: 326

URL: http://svn.debian.org/wsvn/pkg-bioc/?sc=1&rev=326
Log:
* the build is stopped if a file 'stop' is present in the tolls-ng directory. ctrl-C is not really friend with pbuilder and cowbuilder

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=326&op=diff
==============================================================================
--- trunk/tools-ng/pkgbioc.pm (original)
+++ trunk/tools-ng/pkgbioc.pm Sat Sep 29 15:33:50 2007
@@ -42,6 +42,7 @@ our @EXPORT = qw(check_requierment
   recursivepredecessors
   MarkedPackageUnbuildable
   doQAcheck
+  Checkstop
 );
 
 our @EXPORT_OK = qw( );
@@ -102,7 +103,8 @@ sub MarkedPackageUnbuildable ($$$$) {
 
     # remove the $packagehashref->{BuildDir} if the directory is here....
 	# if it's failing, the next call of r_pkg_update, will clean it.
-    if (( ! $main::inspectfailedbuild ) && ( -d $packagehashref->{BuildDir} )) {
+    if ( ( !$main::inspectfailedbuild ) && ( -d $packagehashref->{BuildDir} ) )
+    {
         system("rm -rf $packagehashref->{BuildDir}");
     }
 
@@ -1042,4 +1044,11 @@ sub loadDescriptionsForPackage($$$$$$$) 
 
 }
 
+sub Checkstop() {
+    if ( -f "stop" ) {
+        print "exiting as ask (I found the stop file).\n";
+        exit;
+    }
+}
+
 1;

Modified: trunk/tools-ng/r_pkg_ordering.pl
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/r_pkg_ordering.pl?rev=326&op=diff
==============================================================================
--- trunk/tools-ng/r_pkg_ordering.pl (original)
+++ trunk/tools-ng/r_pkg_ordering.pl Sat Sep 29 15:33:50 2007
@@ -328,8 +328,10 @@ if ($debug) {
 
 if ($debug) {
     print "The list of AlreadyIncludeInDebian are:\n";
-    foreach my $k ( sort { lc($a) cmp lc($b) }
-        keys %{ $globalstuff{AlreadyinDebian} } )
+    foreach my $k (
+        sort { lc($a) cmp lc($b) }
+        keys %{ $globalstuff{AlreadyinDebian} }
+      )
     {
         print "'$k':'$globalstuff{AlreadyinDebian}{$k}'\n";
     }
@@ -342,8 +344,10 @@ if ($debug) {
   readListListList( $listdirectory . "/extraTargets.list" );
 
 if ($debug) {
-    foreach my $pkg ( sort { lc($a) cmp lc($b) }
-        keys %{ $globalstuff{extraTargets} } )
+    foreach my $pkg (
+        sort { lc($a) cmp lc($b) }
+        keys %{ $globalstuff{extraTargets} }
+      )
     {
         my $targets = $globalstuff{extraTargets}{$pkg};
         if ( defined($targets) ) {
@@ -383,10 +387,8 @@ my %repositoryOf  = ();
 # We now know the source, the repository of, we can check the added buildDeps for conformity.
 # By experince, most of the errors are comming from here.
 #
-# TODO secure the import!
-#
 # adding some build dependencies....
-
+#
 # The buildDeps hash should list only those packages that are not
 # assignable from the information stated in the upstream DESCRIPTION
 # file.
@@ -536,6 +538,8 @@ my $packageno = 0;
 foreach my $package (@nodes) {
     $packageno++;
 
+    Checkstop();
+
     print "\n";
     print "************************************************\n";
     print "Packaging #$packageno of "
@@ -693,8 +697,7 @@ foreach my $package (@nodes) {
 
     }
     elsif ( -s $debfile ) {
-        print
-          "\t$package is already built, $debfile exist, skipping package\n"
+        print "\t$package is already built, $debfile exist, skipping package\n"
           if $verbose;
 		if( $rebuildall ) {
 			print "\tbut rebuilding anyway as you are asking\n";
@@ -788,6 +791,7 @@ foreach my $package (@nodes) {
             "Cannot create debian/ in " . $packagehashref->{BuildDir} );
         next;
     }
+    #isbinary($packagehashref);
     writePatches( $packagehashref, $globalstuff{hasPatches}{$package} )
       if ( exists( $globalstuff{hasPatches}{$package} ) );
     writeRules( $packagehashref, $globalstuff{extraTarget}{$package},
@@ -836,7 +839,7 @@ foreach my $package (@nodes) {
 
 # printing the duplicated packages
 open( HTML, ">$webdir/duplicated.html" )
-  || die "Cannot open for writting duplicated.html !\n";
+  || die "Cannot open for writting $webdir/duplicated.html !\n";
 print HTML "\n----------------------------------\n";
 print HTML "The list of duplicated package are:\n";
 foreach
@@ -852,7 +855,7 @@ HTML->close;
 
 # printing the unbuildable packages
 open( HTML, ">$webdir/cannotbuild.html" )
-  || die "Cannot open for writting cannotbuild.html !\n";
+  || die "Cannot open for writting $webdir/cannotbuild.html !\n";
 
 print HTML "\n----------------------------------\n";
 print HTML "Success: $success\n";