Changeset 2259 in ProjectBuilder

Timestamp:

Aug 30, 2017, 5:07:40 PM (7 years ago)

Author:

Bruno Cornec

Message:

Return from Env.pm early enough if command is updateconf

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Env.pm (modified) (1 diff)
• pb/bin/pb (modified) (1 diff)

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

@@ -344 +344 @@
 pb_log(1,"PBBUILDDIR: $ENV{'PBBUILDDIR'}\n");
 
-return if ($action =~ /^clean$/);
+return if ($action =~ /^(clean|updateconf)$/);
 #
 # The following part is only useful when in sbx|cms2something or newsomething

devel/pb/bin/pb

@@ -1095 +1095 @@
         $fyml =~ s/\.pb/.yml/;
         $fyml =~ s/\.pbrc/.pbrc.yml/;
-        pb_update_conf_v0($f,$fyml);
+        pb_conf_update_v0($f,$fyml);
     }
 } elsif ($action =~ /^getconf$/) {