Changeset 681 in ProjectBuilder for devel/pb-modules

Timestamp:

Feb 15, 2009, 10:05:00 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Differentiate between Scripts for VE and VM with 2 tags
• Have a working newve, setupve and cms2ve sequence for rinse and centos5 at least (rest to be tested)
• Planned usage of chroot (tested) and schroot (not tested)
• Remove the external locale dependece to use the one provided by perl !
• Fix CentOS support in Distribution module

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Base.pm (modified) (1 diff)
• Display.pm (modified) (1 diff)
• Distribution.pm (modified) (2 diffs)

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

@@ -20 +20 @@
 use Pod::Usage;
 use English;
-use locale;
-use POSIX qw(setlocale);
+use POSIX qw(locale_h);
 
 # Inherit from the "Exporter" module which handles exporting functions.

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

@@ -17 +17 @@
 use Pod::Usage;
 use English;
-use locale;
 use Locale::gettext;
-use POSIX qw(setlocale);
+use POSIX qw(locale_h);
 use ProjectBuilder::Base;
 

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

@@ -258 +258 @@
     'vmware'                => 'VMware ESX Server (\d+) \(',
     'rhel'                  => 'Red Hat (?:Enterprise Linux|Linux Advanced Server) .*release ([0-9.]+).* \(',
-    'centos'                => '.*CentOS .*release (.+) ',
+    'centos'                => '.*CentOS .*release ([0-9]).* ',
     'redhat'                => 'Red Hat Linux release (.+) \(',
     'sles'                  => 'SUSE .* Enterprise Server (\d+) \(',
@@ -411 +411 @@
     # What we found with the regexp is the list of deps.
     pb_log(2,"found deps: $_\n");
-    s/$regexp/$1/;
+    s/$regexp/$1/i;
     # Remove conditions in the middle and at the end
     s/[><=]+.*,/,/g;