Changeset 1027 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder
- Timestamp:
- May 21, 2010, 3:29:59 PM (14 years ago)
- Location:
- devel/pb-modules/lib/ProjectBuilder
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Conf.pm
r963 r1027 216 216 =item B<pb_conf_fromfile_if> 217 217 218 This function returns a pointer on a table, corresponding to a merge of values quer ried in the conf file and the pointer on another table passed as parameter. It takes a table of keys as last input parameter.218 This function returns a pointer on a table, corresponding to a merge of values queried in the conf file and the pointer on another table passed as parameter. It takes a table of keys as last input parameter. 219 219 220 220 my ($k1) = pb_conf_fromfile_if("$HOME/.pbrc",undef,"pbver","pblist"); -
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r982 r1027 167 167 my ($d,$r); 168 168 while (($d,$r) = each %$single_rel_files) { 169 if (defined $ambiguous_rel_files->{$d}) { 170 print STDERR "The key $d is considered as both unambiguous and ambigous.\n"; 171 print STDERR "Please fix your configuration file.\n"; 172 } 169 173 if (-f "$r" && ! -l "$r") { 170 174 my $tmp=pb_get_content("$r"); … … 183 187 184 188 # Now look at ambiguous files 185 # Ubuntu includes a /etc/debian_version file that creates an ambiguity with debian189 # Ubuntu before 10.04 includes a /etc/debian_version file that creates an ambiguity with debian 186 190 # So we need to look at distros in reverse alphabetic order to treat ubuntu always first via lsb 187 191 foreach $d (reverse keys %$ambiguous_rel_files) {
Note:
See TracChangeset
for help on using the changeset viewer.