Changeset 1923 in ProjectBuilder for 0.12.7

Timestamp:

Dec 26, 2014, 2:24:19 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Intermediate 0.12.7 version to fix an issue with checkssh where Ubuntu/Debian distro are not checked per arch but globally

Location:

0.12.7

Files:

• . (copied) (copied from 0.12.6 )
• pb/bin/pb (modified) (3 diffs)

0.12.7/pb/bin/pb

@@ -3713 +3713 @@
     my $pbos = pb_distro_get_context();
     my $distrolist = pb_get_distros($pbos,undef);
+    # List of distriubtions
     my %dl;
     my %theorlist;
@@ -3803 +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"} = 0;
-                    # TODO are we always using the last arch ?
+                    $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"."_$pbos->{'arch'}"} = 0;
                     $archlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"} = "$pbos->{'arch'}";
                 } elsif ($pbos->{'type'} eq "ebuild") {
@@ -3888 +3888 @@
             my $p = $_;
             $p =~ s/\.(i[3456]86|x86_64|noarch|src)\.rpm$//;
-            $p =~ s/_(i[3456]86|amd64|all)\.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));