Changeset 1424 in ProjectBuilder

Timestamp:

Feb 25, 2012, 2:23:00 AM (12 years ago)

Author:

Bruno Cornec

Message:

• use more pb_rm_rf function instead of calling pb_system rm -rf
• Fix bugs on check for gentoo. -r is for official versions, _p for test versions

File:

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

devel/pb/bin/pb

@@ -1353 +1353 @@
             close(LOG);
             chdir ".." || die "Unable to chdir to parent dir";
-            pb_system("rm -rf $pbpkg-$pbver", "Cleanup");
+            pb_rm_rf("$pbpkg-$pbver");
         } elsif ($pbos->{'type'} eq "ebuild") {
             my @ebuildfile;
@@ -1427 +1427 @@
             }
             chdir ".." || die "Unable to chdir to parent dir";
-            pb_system("rm -rf $pbpkg-$pbver", "Cleanup");
+            pb_rm_rf("$pbpkg-$pbver");
         } elsif ($pbos->{'type'} eq "pkg") {
             # Solaris
@@ -1471 +1471 @@
             }
             chdir ".." || die "Unable to chdir to parent dir";
-            pb_system("rm -rf $pbpkg-$pbver $ENV{'PBBUILDDIR'}/$pbos->{'type'} $pkgdestdir", "Cleanup");
+            pb_rm_rf("$pbpkg-$pbver","$ENV{'PBBUILDDIR'}/$pbos->{'type'}","$pkgdestdir");
         } elsif ($pbos->{'type'} eq "hpux") {
             # HP-UX
@@ -1492 +1492 @@
 
             chdir ".." || die "Unable to chdir to parent dir";
-            pb_system("rm -rf $pbpkg-$pbver", "Cleanup");
+            pb_rm_rf("$pbpkg-$pbver");
         } else {
             die "Unknown OS type format $pbos->{'type'}";
@@ -3333 +3333 @@
                     $archlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"} = "$pbos->{'arch'}";
                 } elsif ($pbos->{'type'} eq "ebuild") {
-                    $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkg-$pbver"."_p$pbtag.ebuild"} = 0;
-                    $archlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkg-$pbver"."_p$pbtag.ebuild"} = "$pbos->{'arch'}";
+                    my $prefix = "-r";
+                    $prefix = "_p" if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i));
+                    $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkg-$pbver$prefix$pbtag.ebuild"} = 0;
+                    $archlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkg-$pbver$prefix$pbtag.ebuild"} = "$pbos->{'arch'}";
                 } elsif ($pbos->{'type'} eq "pkg") {
                     $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/$pbrealpkg-$pbver-$pbtag.pkg"} = 0;
@@ -3412 +3414 @@
             $p =~ s/\.(i[3456]86|x86_64|noarch|src)\.rpm$//;
             $p =~ s/_(i[3456]86|amd64|all).deb$//;
-            $p =~ s/(-0\.|_p[0-9]{8})[0-9]{6}/$1*/ if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i));
+            $p =~ s/(-0\.[0-9]{8})[0-9]{6}/$1*/ if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i));
+            $p =~ s/(-r|_p[0-9]+)\.ebuild/$1*/ if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i));
             $theorlist{$p} = -2 if (not defined $theorlist{$p});
             $theorlist{$p} = $theorlist{$p} + 1;