Changeset 1540 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder

Timestamp:

May 13, 2012, 1:03:52 PM (12 years ago)

Author:

Bruno Cornec

Message:

• vmmonport is now optional
• vmmem is also now really optional (wasn't working before as wasn't correctly tested)
• We are allowed to kill the sleep during VMs wait without it aborting the process
• newv(e|m) doesn't require execution of cms2build before being available
• Fix another git support error introduced earlier

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Distribution.pm (modified) (2 diffs)
• Env.pm (modified) (1 diff)
• VCS.pm (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -112 +112 @@
     'nover' => "false",
     'rmdot' => "false",
+    'useminor' => "false",
     };
 $pbos->{'name'} = shift;
@@ -644 +645 @@
 sub pb_distro_get_param {
 
-my @param;
+my @param = ();
 my $pbos = shift;
 

devel/pb-modules/lib/ProjectBuilder/Env.pm

@@ -1210 +1210 @@
     umask 0022;
     return(\%filteredfiles, \%supfiles, \%defpkgdir, \%extpkgdir);
+} elsif ($action =~ /^newv/) {
+    # No PBDESTDIR yet so doing nothing
+    return;
 } else {
     # Setup the variables from what has been stored at the end of cms2build

devel/pb-modules/lib/ProjectBuilder/VCS.pm

@@ -267 +267 @@
 } elsif ($scheme =~ /^git/) {
     open(GIT,"git --git-dir=$dir/.git remote -v |") || return("");
-    while (<GITRC>) {
+    while (<GIT>) {
         next unless (/^origin\s+(\S+) \(push\)$/);
         return $1;
     }
-    close(GITRC);
+    close(GIT);
     warn "Unable to find origin remote for $dir";
     return "";