Changeset 1926 in ProjectBuilder

Timestamp:

Dec 26, 2014, 11:36:48 PM (10 years ago)

Author:

Bruno Cornec

Message:

-Improves deb checkssh support again

Files:

• 0.12.7/pb/bin/pb (modified) (1 diff)
• devel/pb-modules/etc/pb.conf (modified) (1 diff)

0.12.7/pb/bin/pb

@@ -4360 +4360 @@
 my $pb = shift;
 my $pbos = shift;
-my $archp = undef;
-
+my $archp = $pbos->{'arch'};
+
+# Only used for Debian as of now
 # Either we have an Architecture: all (deb noarch) in the control file or we have the arch we're building for
 # We look after this info in the tar built during previous phases hoping it's still available and valid
 # If not, we rebuild it
-my $src2="$ENV{'PBDESTDIR'}/$pb->{'realpkg'}-$pb->{'ver'}$pb->{'extdir'}.pbconf.tar.gz";
-pb_system("cd $ENV{'PBBUILDDIR'} ; tar xfz $src2","Extracting pbconf","","quiet");
 if ($pbos->{'type'} eq "deb") {
-    my $ctrlf = "$pb->{'realpkg'}-$pb->{'ver'}$pb->{'extdir'}/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/control";
+    my $ctrlf = "$ENV{'PBBUILDDIR'}/$pb->{'realpkg'}-$pb->{'ver'}$pb->{'extdir'}/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/control";
+    pb_system("cd $ENV{'PBBUILDDIR'} ; tar xfz $ENV{'PBDESTDIR'}/$pb->{'realpkg'}-$pb->{'ver'}$pb->{'extdir'}.pbconf.tar.gz","Extracting pbconf","","quiet") if (! -f $ctrlf );
     open(CTRL, $ctrlf) || die "Unable to read $ctrlf";
-    $archp = $pbos->{'arch'};
     while (<CTRL>) {
         $archp = "all" if (/^Architecture:\s*all/);

devel/pb-modules/etc/pb.conf

@@ -678 +678 @@
 ospathcmd-halt mageia-1 = /sbin/halt
 ospathcmd-halt mageia-2 = /sbin/halt
+ospathcmd-halt mandriva-2007.0 = /usr/bin/halt
 ospathcmd-halt mageia = /usr/bin/halt