Changeset 2256 in ProjectBuilder for devel/pb-modules
- Timestamp:
- Aug 30, 2017, 5:07:36 PM (7 years ago)
- Location:
- devel/pb-modules/lib/ProjectBuilder
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Conf.pm
r2254 r2256 205 205 } else { 206 206 chomp(); 207 warn "unexpected line '$_' in $ f";207 warn "unexpected line '$_' in $cf"; 208 208 } 209 209 } … … 557 557 if (/^\s*([A-z0-9-_]+)\s+(.+)$/) { 558 558 # Handle parameters 559 my ($param,$v oid) = ($1, $2);559 my ($param,$var) = ($1, $2); 560 560 print DEST " $param:\n" if ($param ne $parambkp); 561 561 print DEST " $lh0->{$param} $lh0->{$param}->{$var}\n"; -
devel/pb-modules/lib/ProjectBuilder/Env.pm
r2253 r2256 207 207 $p->{$ENV{'PBPROJ'}} = pb_path_expand($p->{$ENV{'PBPROJ'}}); 208 208 # TODO: should we add the conf files pointed by project default as well ? 209 pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml") if (-f "$p->{$ENV{'PBPROJ'}}/.pbrc.yml"); 209 if (-f "$p->{$ENV{'PBPROJ'}}/.pbrc.yml") { 210 pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml"); 211 } elsif (-f "$p->{$ENV{'PBPROJ'}}/.pbrc") { 212 pb_conf_update_v0("$p->{$ENV{'PBPROJ'}}/.pbrc","$p->{$ENV{'PBPROJ'}}/.pbrc.yml"); 213 pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml"); 214 my ($pburl) = pb_conf_get("pburl"); 215 my ($scheme, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}}); 216 #pb_vcs_add_if_not_in($scheme,"$p->{$ENV{'PBPROJ'}}/.pbrc.yml"); 217 } 210 218 } 211 219 }
Note:
See TracChangeset
for help on using the changeset viewer.