Changeset 1925 in ProjectBuilder

Timestamp:

Dec 26, 2014, 3:39:16 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix checkssh errors with this version

File:

• 0.12.7/pb/bin/pb (modified) (3 diffs)

0.12.7/pb/bin/pb

@@ -3804 +3804 @@
                     $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/$pbrealpkgrpm-$pbver-$pbtag$pbos->{'suffix'}"} = 0;
                 } elsif ($pbos->{'type'} eq "deb") {
-                    $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"."_$pbos->{'arch'}"} = 0;
-                    $archlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"} = "$pbos->{'arch'}";
+                    my $pb;
+                    $pb->{'realpkg'} = $pbrealpkg;
+                    $pb->{'ver'} = $pbver;
+                    $pb->{'extdir'} = pb_get_extdir();
+                    my $archp = pb_get_pkg_arch($pb,$pbos);
+                    $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"."_$archp"} = 0;
+                    $archlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"} = "$archp";
                 } elsif ($pbos->{'type'} eq "ebuild") {
                     my $prefix = "-r";
@@ -3888 +3893 @@
             my $p = $_;
             $p =~ s/\.(i[3456]86|x86_64|noarch|src)\.rpm$//;
+            $p =~ s/_amd64\.deb$/_x86_64.deb/;
             $p =~ s/\.deb$//;
-            #$p =~ s/_(i[3456]86|amd64|all)\.deb$//;
             $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));
@@ -4348 +4353 @@
 }
 
+# 
+# Return the arch of the package considered
+#
+sub pb_get_pkg_arch {
+
+my $pb = shift;
+my $pbos = shift;
+my $archp = undef;
+
+# 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";
+    open(CTRL, $ctrlf) || die "Unable to read $ctrlf";
+    $archp = $pbos->{'arch'};
+    while (<CTRL>) {
+        $archp = "all" if (/^Architecture:\s*all/);
+    }
+    close(CTRL);
+}
+return($archp);
+}
+
 # Manages VM/RM SSH port communication
 sub pb_get_port {