Changeset 1285 in ProjectBuilder

Timestamp:

Mar 29, 2011, 2:18:20 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix #96 completely by using the realpkgname and sorting the results

File:

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

devel/pb/bin/pb

@@ -3270 +3270 @@
 
         # TODO: use virtual/real names here now
-        $findstr .= "-name \'$pbpkg-$pbver-$pbtag\.*.rpm\' -o -name \'$pbpkg"."_$pbver*\.deb\' -o -name \'$pbpkg-$pbver*\.ebuild\' -o -name \'$pbpkg-$pbver*\.pkg\' -o -name \'$pbpkg-$pbver*\.sd\' ";
+        my $pbrealpkg = $pbpkg;
+        my $pbrealpkgrpm = pb_cms_get_real_pkg($pbpkg,"rpm");
+        my $pbrealpkgdeb = pb_cms_get_real_pkg($pbpkg,"deb");
+        $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\' ";
 
         my $chglog;
@@ -3282 +3285 @@
         open(OUT,"> $ENV{'PBTMP'}/$pbpkg.ann") || die "Unable to create $ENV{'PBTMP'}/$pbpkg.ann: $!";
         my $pb;
-        $pb->{'realpkg'} = $pbpkg;
+        $pb->{'realpkg'} = $pbrealpkg;
         $pb->{'ver'} = $pbver;
         $pb->{'tag'} = $pbtag;
@@ -3301 +3304 @@
     open(PBS,"> $ENV{'PBTMP'}/pbscript") || die "Unable to create $ENV{'PBTMP'}/pbscript";
     print PBS "set -x\n" if ($pbdebug gt 1);
-    print PBS "$findstr\n";
+    print PBS "$findstr | sort\n";
     close(PBS);
     chmod 0755,"$ENV{'PBTMP'}/pbscript";