Changeset 1078 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Jul 26, 2010, 1:48:10 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Fix an issue in VE setup with the new delivery variable (forgot indirection)
• Fix Mandriva 2010.1 VE built with right dep pkg list

File:

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

devel/pb/bin/pb

@@ -1278 +1278 @@
     my $bdir;
     if (($cmt eq "Sources") || ($cmt =~ /V[EM]Script/)) {
-        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery/src";
+        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/src";
     } elsif (($cmt =~ /V[EM]build/)  || ($cmt =~ /V[EM]test/)) {
         $tdir = $sshdir->{$ENV{'PBPROJ'}}."/$ENV{'PBPROJ'}/delivery";
@@ -1285 +1285 @@
         $bdir =~ s|\$ENV.+\}/||;
     } elsif ($cmt eq "Announce") {
-        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery";
+        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}";
     } elsif ($cmt eq "Web") {
-        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery";
+        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}";
     } elsif ($cmt eq "Packages") {
-        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery/$ddir/$dver";
+        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/$ddir/$dver";
 
         my $repodir = $tdir;