Changeset 1393 in ProjectBuilder for devel/pb/bin

Timestamp:

Jan 24, 2012, 4:17:09 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix some printing aspects and add removal of sources for cleanssh

File:

• devel/pb/bin/pb (modified) (4 diffs)

devel/pb/bin/pb

@@ -3288 +3288 @@
             $pbtag = "0.[0-9][0-9]*";
             $findstr .= "-name \'$pbrealpkgrpm-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgrpm-debug-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag"."_*\.deb\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag.dsc\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag.tar.gz\' -o -name \'$pbrealpkg-$pbver"."_p[0-9]*\.ebuild\' -o -name \'$pbrealpkg-$pbver-$pbtag*\.pkg\' -o -name \'$pbrealpkg-$pbver-$pbtag*\.sd\' ";
+            $srcstr .= "src/$pbrealpkg-$pbver.tar.gz src/$pbrealpkg-$pbver.pbconf.tar.gz ";
         } else {
             $findstr .= "-name \'$pbrealpkgrpm-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgdeb"."_$pbver*\.deb\' -o -name \'$pbrealpkg-$pbver*\.ebuild\' -o -name \'$pbrealpkg-$pbver*\.pkg\' -o -name \'$pbrealpkg-$pbver*\.sd\' ";
-            $srcstr .= "src/$pbrealpkg-$pbver.tar.gz src/$pbrealpkg-$pbver.pbconf.tar.gz";
         }
 
@@ -3353 +3353 @@
     pb_send2target("Announce");
 
-    # Nothing more for th cleanssh case
-    return if ($antype eq "Clean");
-
     my $sl = "Project $ENV{'PBPROJ'} version $ENV{'PBPROJVER'} is now available";
     if ($antype eq "Announce") {
@@ -3392 +3389 @@
                 $i = 1;
             }
+        }
+    } elsif ($antype eq "Clean") {
+        while (<LOG>) {
+            # skip errors
+            next if ($_ !~ /^removed /);
+            pb_log(0,"$_");
         }
     } else {
@@ -3409 +3412 @@
     }
     close(LOG);
+
+    # Nothing more for the cleanssh case
+    return if ($antype eq "Clean");
 
     if ($antype eq "Check") {