Changeset 423 in ProjectBuilder

Timestamp:

May 3, 2008, 1:03:24 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Improved pbdistrocheck to support -v flags
• Fix Ubuntu issue on distribution detection
• some more pb_log added

Files:

• devel/pb-modules/bin/pbdistrocheck (modified) (1 diff)
• devel/pb-modules/lib/ProjectBuilder/Base.pm (modified) (1 diff)
• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (5 diffs)
• devel/pb/bin/pb (modified) (1 diff)
• projects/mondorescue/pbconf/branches/2.2.6/mondorescue.pb (modified) (1 diff)

devel/pb-modules/bin/pbdistrocheck

@@ -9 +9 @@
 
 use strict 'vars';
+use Getopt::Long qw(:config auto_abbrev no_ignore_case);
 use Data::Dumper;
 use lib qw (lib);
-use ProjectBuilder::Distribution qw (pb_distro_init);
+use ProjectBuilder::Distribution;
+use ProjectBuilder::Base;
+
+my %opts;                   # CLI Options
+
+GetOptions("verbose|v+" => \$opts{'v'});
+if (defined $opts{'v'}) {
+    $debug = $opts{'v'};
+}
+if (defined $opts{'l'}) {
+    open(LOG,"> $opts{'l'}") || die "Unable to log to $opts{'l'}: $!";
+    $LOG = \*LOG;
+    $debug = 0  if ($debug == -1);
+    }
+pb_log_init($debug, $LOG);
 
 my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init();

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

@@ -216 +216 @@
 $debug = shift || 0;
 $LOG = shift || \*STDOUT;
+pb_log(1,"Debug value: $debug\n");
 
 } 

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

@@ -9 +9 @@
 
 use strict;
+use Data::Dumper;
 use ProjectBuilder::Base;
 
@@ -221 +222 @@
     'suse'              => ['suse', 'sles', 'opensuse'],
     'redhat'            => ['redhat', 'rhel', 'centos', 'mandrake', 'vmware'],
-    'lsb'               => ['ubuntu', 'debian', 'lsb'],
+    'lsb'               => ['ubuntu', 'lsb'],
     );
 
@@ -241 +242 @@
     'opensuse'              => 'openSUSE (\d.+) \(',
     'lsb'                   => '.*[^Ubunt].*\nDISTRIB_RELEASE=(.+)',
-# Ubuntu 6.06 includes a /etc/debian_version file that needs to be 
-# renamed to /etc/debian_version.sav as there is no way to distinguish
-# Ubuntu 6.06 from debian testing otherwise
-# Same is true for Ubuntu 7.10 :-(
+# Ubuntu includes a /etc/debian_version file that cretaes an ambiguity with debian
+# So we need to look at distros in reverse alphabetic order to treat ubuntu always first
     'ubuntu'                => '.*Ubuntu.*\nDISTRIB_RELEASE=(.+)',
     'debian'                => '(.+)',
@@ -274 +273 @@
 }
 
-while (($d,$r) = each %ambiguous_rel_files) {
-    if (-f "$base/$r" && !-l "$base/$r"){
+# Now look at ambiguous files
+# Ubuntu 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) {
+    $r = $ambiguous_rel_files{$d};
+    if (-f "$base/$r" && !-l "$base/$r") {
         # Found one possibility. 
         # Get all distros concerned by that file
@@ -281 +284 @@
         my $found = 0;
         my $ptr = $distro_similar{$d};
-        #pb_log(2,$LOG "amb: ".Dumper($ptr)."\n" if ($debug >= 1);
+        pb_log(2,"amb: ".Dumper($ptr)."\n");
         $release = "unknown";
         foreach my $dd (@$ptr) {
-            #pb_log(2,$LOG "check $dd\n" if ($debug >= 1);
+            pb_log(2,"check $dd\n");
             # Try to check pattern
             if (defined $distro_match{$dd}) {
-                #pb_log(2,$LOG "cmp: $distro_match{$dd} - vs - $tmp\n" if ($debug >= 1);
+                pb_log(2,"cmp: $distro_match{$dd} - vs - $tmp\n");
                 ($release) = $tmp =~ m/$distro_match{$dd}/m;
                 if ((defined $release) && ($release ne "unknown")) {

devel/pb/bin/pb

@@ -331 +331 @@
 if (defined $opts{'v'}) {
     $debug = $opts{'v'};
-    pb_log(0,"Debug value: $debug\n");
 }
 if (defined $opts{'f'}) {

projects/mondorescue/pbconf/branches/2.2.6/mondorescue.pb

@@ -28 +28 @@
 # a QEMU rhel_3 here means that the VM will be named rhel_3.qemu
 #
-vmlist mondorescue = mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,fedora-7-i386,fedora-8-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,fedora-6-x86_64,fedora-7-x86_64,fedora-8-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64
+vmlist mondorescue = mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,fedora-7-i386,fedora-8-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,ubuntu-8.04-i386,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,fedora-6-x86_64,fedora-7-x86_64,fedora-8-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64
 
 #