openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File HACK.diff of Package kiwi (Revision 79a0ae26913150f2055e7214e9e75d3a)

Currently displaying revision 79a0ae26913150f2055e7214e9e75d3a , Show latest

diff --git a/modules/KIWICollect.pm b/modules/KIWICollect.pm
index 548e215..ffb7b90 100644
--- a/modules/KIWICollect.pm
+++ b/modules/KIWICollect.pm
@@ -1542,9 +1542,12 @@ sub collectProducts
       if(!mkpath("$tmp", { mode => 0755 } )) {
         $this->logMsg("E", "can't create dir <$tmp>");
       }
+      if ( $this->{m_repoPacks}->{$i}->{'newpath'} eq "" || $this->{m_repoPacks}->{$i}->{'newfile'} eq "" ){
+         $this->logMsg("I", "Skip product release package $i");
+         next;
+      }
       my $file = $this->{m_repoPacks}->{$i}->{'newpath'}."/".$this->{m_repoPacks}->{$i}->{'newfile'};
-      $this->logMsg("I", "Unpacking product release package ".$file);
-      $this->logMsg("I", "Unpacking product release package ".$file." ".$tmp);
+      $this->logMsg("I", "Unpacking product release package $i in file $file ".$tmp);
       $this->{m_util}->unpac_package($file, $tmp);
 
       # get all .prod files
diff --git a/modules/KIWICollect.pm b/modules/KIWICollect.pm
index ffb7b90..4ceddd0 100644
--- a/modules/KIWICollect.pm
+++ b/modules/KIWICollect.pm
@@ -1539,6 +1539,7 @@ sub collectProducts
   # This will become nicer when we switched to rpm-md as product repo format
   my $found_product = 0;
   foreach my $i(grep($_ =~ /-release$/,keys(%{$this->{m_repoPacks}}))) {
+      qx(rm -rf $tmp);
       if(!mkpath("$tmp", { mode => 0755 } )) {
         $this->logMsg("E", "can't create dir <$tmp>");
       }
@@ -1588,9 +1589,9 @@ sub collectProducts
 #   my $proddir  = $this->{m_proddata}->getVar("PRODUCT_DIR");
       }
 
-      # cleanup
-      qx(rm -rf $tmp);
   }
+  # cleanup
+  qx(rm -rf $tmp);
 }
 
 
@@ -1938,7 +1939,7 @@ sub createDirectoryStructure
   my $errors = 0;
 
   foreach my $d(keys(%dirs)) {
-		next if $dirs{$d} == 0;
+    next if $dirs{$d} == 0;
     if(-d $d) {
       $dirs{$d} = 0;
     }

Places

File HACK.diff of Package kiwi (Revision 79a0ae26913150f2055e7214e9e75d3a)

Places