[Midnightbsd-cvs] mports: magus.pl: Fix bug with deleting the old mports dir.

[ctriv at midnightbsd.org]

Log Message:
-----------
Fix bug with deleting the old mports dir.
Fixed bug with package uploading.

Modified Files:
--------------
    mports/Tools/magus/slave:
        magus.pl (r1.25 -> r1.26)

-------------- next part --------------
Index: magus.pl
===================================================================
RCS file: /home/cvs/mports/Tools/magus/slave/magus.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -L Tools/magus/slave/magus.pl -L Tools/magus/slave/magus.pl -u -r1.25 -r1.26
--- Tools/magus/slave/magus.pl
+++ Tools/magus/slave/magus.pl
@@ -82,6 +82,7 @@
 our $Children = 0;
 our @DeadChildren;
 our %WorkerIDs;
+our $LastExit;
 
 $SIG{CHLD} = sub {
   my $pid;
@@ -89,6 +90,7 @@
   while (($pid = waitpid(-1, WNOHANG)) > 0) {
     # we don't care about children that aren't magus.pls (make and what not also go thru this).
     my $info = delete $Children{$pid} || return;
+    
     $Children--;
     $WorkerIDs{$info->{worker_id}} = 1;
     push(@DeadChildren, {lock => $info->{lock}, pid => $pid});
@@ -126,10 +128,10 @@
   eval { main() };
 
   if ($@) {
-    my $error = $@;
+    local $_ = $@;
     
     # Check ping in case a dropped DB caused some other exception.
-    if (($@ =~ m/lost\s+connection/i || m/can't\s+connect/i || m/server\s+shutdown/i || m/gone\s+away/i) || !Magus::DBI->ping) {
+    if ((m/lost\s+connection/i || m/can't\s+connect/i || m/server\s+shutdown/i || m/gone\s+away/i) || !Magus::DBI->ping) {
       while (1) {
         report(err => "Could not connect to database ($@) waiting $Magus::Config{'LostDBWaitPeriod'} seconds");
         sleep($Magus::Config{'LostDBWaitPeriod'});
@@ -140,7 +142,7 @@
 
       # back up to the main() call we go.
     } else {
-      die $error;
+      die $_;
     }
   }
 }
@@ -247,6 +249,10 @@
   );
 
   copy_dep_pkgfiles($lock, $chroot);
+
+  my $file = sprintf("%s-%s.%s", $port->pkgname, $port->version, $Magus::Config{'PkgExtension'});
+  my $from = join('/', $chroot->root, $chroot->packages, 'All', $file);
+
   
   $chroot->do_chroot();
   chdir($port->origin);
@@ -255,6 +261,8 @@
   report('info', "Building $port");
   my $results = $test->run;
   
+  $results->{pkgfile} = $from;
+    
   store_results($results);
 }
 
@@ -304,30 +312,34 @@
   if ($? != 0) {
     die "$cmd returned non-zero: $out\n";
   }
+  
 }  
   
 
-=head2 upload_pkgfile($port, $chroot)  
+=head2 upload_pkgfile($port, $file)  
   
 Upload the built package of the current port to the master dir.
 
 =cut
 
 sub upload_pkgfile {
-  my ($port, $chroot) = @_;
+  my ($port, $from) = @_;
 
-  my $file = sprintf("%s-%s.%s", $port->pkgname, $port->version, $Magus::Config{'PkgExtension'});
-  my $from = join('/', $chroot->root, $chroot->packages, 'All', $file);
   my $run  = $port->run->id;
+  my $file = sprintf("%s-%s.%s", $port->pkgname, $port->version, $Magus::Config{'PkgExtension'});
           
   my $cmd = "/usr/bin/scp $from $Magus::Config{'PkgfilesRoot'}/$run/$file";
   report('debug', "uploading: $run/$file");
   
   my $out = `$cmd 2>&1`;
 
-  if ($? != 0) {
-    die "$cmd returned non-zero: $out\n";
-  }
+ # if ($LastExit != 0 ) {
+ #   die "$cmd returned non-zero: $out\n";
+ # }
+  
+  # we should really check the error message, but we won't handle the logging of the exception correctly anyways..
+  # so for now, we just assume things go right.  I will need to look at this again.
+
 }  
 
 
@@ -360,6 +372,11 @@
   if ($results->{log}) {
     Magus::Log->insert({ port => $port, data => $results->{log}->{data}});
   }
+  
+  if ($port->status eq 'pass' || $port->status eq 'warn') {
+    upload_pkgfile($port, $results->{pkgfile});
+  }
+  
 }
 
 =head2 daemonize()
@@ -554,7 +571,7 @@
     }
 
     report(debug => "Deleting old $dir/mports");
-    rmtree('$dir/mports');
+    rmtree("$dir/mports");
     
     report(debug => "Extracting %s", $current->tarball);
     system('/usr/bin/tar xf ' . $current->tarball);