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

Timestamp:

May 21, 2010, 3:29:59 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Adds rbsopt parameter + doc to allow for passing options to rpmbootstrap such as -k now by default.
• Mandriva VE are now working (tested with 2010.0 + package list fixed)

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Conf.pm (modified) (1 diff)
• Distribution.pm (modified) (2 diffs)

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

@@ -216 +216 @@
 =item B<pb_conf_fromfile_if>
 
-This function returns a pointer on a table, corresponding to a merge of values querried in the conf file and the pointer on another table passed as parameter. It takes a table of keys as last input parameter.
+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.
 
   my ($k1) = pb_conf_fromfile_if("$HOME/.pbrc",undef,"pbver","pblist");

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

@@ -167 +167 @@
 my ($d,$r);
 while (($d,$r) = each %$single_rel_files) {
+    if (defined $ambiguous_rel_files->{$d}) {
+        print STDERR "The key $d is considered as both unambiguous and ambigous.\n";
+        print STDERR "Please fix your configuration file.\n";
+    }
     if (-f "$r" && ! -l "$r") {
         my $tmp=pb_get_content("$r");
@@ -183 +187 @@
 
 # Now look at ambiguous files
-# Ubuntu includes a /etc/debian_version file that creates an ambiguity with debian
+# Ubuntu before 10.04 includes a /etc/debian_version file that creates an ambiguity with debian
 # So we need to look at distros in reverse alphabetic order to treat ubuntu always first via lsb
 foreach $d (reverse keys %$ambiguous_rel_files) {