Changeset 1071

Timestamp:

07/12/10 19:59:19 (3 years ago)

Author:

bruno

Message:

r3947@sge91-1-82-234-15-218: bruno | 2010-07-10 18:40:35 +0200

• Adds function pb_distro_getlsb and make pbdistrocheck fully lsb_release compatible

Location:

devel/pb-modules

Files:

• bin/pbdistrocheck (modified) (4 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)

devel/pb-modules/bin/pbdistrocheck

@@ -28 +28 @@
 =head1 SYNOPSIS
 
-pbdistrocheck [-d][-v] [distro-ver-arch]
+pbdistrocheck [-d][-v][-l [-c][-i][-r][-a]][-s] [distro-ver-arch]
 
 =head1 OPTIONS
@@ -38 +38 @@
 Print a brief help message and exits.
 
+=item B<-a|--all>
+
+print all parameters
+
+=item B<-s|--short>
+
+generate a short format user friendly, comma separated allowing parsing
+
+=item B<-l|--lsb>
+
+generate an LSB compliant output
+
 =item B<-d|--description>
 
-generate a short format user friendly
-(by default, generate a longer format, comma separated allowing parsing)
+print only description (LSB only)
+
+=item B<-r|--release>
+
+print only release (LSB only)
+
+=item B<-c|--codename>
+
+print only codename (LSB only)
+
+=item B<-i|--id>
+
+print only distribution identificator (LSB only)
+
+=item B<-a|--all>
+
+print all LSB fields
 
 =back 
@@ -77 +104 @@
 GetOptions(
         "verbose|v+" => \$opts{'v'},
-        "description|d" => \$opts{'d'}
+        "short|s" => \$opts{'s'},
+        "description|d" => \$opts{'d'},
+        "id|i" => \$opts{'i'},
+        "release|r" => \$opts{'r'},
+        "codename|c" => \$opts{'c'},
+        "all|a" => \$opts{'a'},
+        "lsb|l" => \$opts{'l'},
 );
 if (defined $opts{'v'}) {
     $pbdebug = $opts{'v'};
 }
-if (defined $opts{'l'}) {
-    open(pbLOG,"> $opts{'l'}") || die "Unable to log to $opts{'l'}: $!";
-    $pbLOG = \*pbLOG;
-    $pbdebug = 0  if ($pbdebug == -1);
-    }
-pb_log_init($pbdebug, $pbLOG);
+pb_log_init($pbdebug, \*STDOUT);
 
 my $dist = shift @ARGV || undef ;
@@ -94 +122 @@
 
 my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init(@param);
-if (defined $opts{'d'}) {
-    print "\u$ddir $dver $arch\n";
+my $sep = "\n";
+if (defined $opts{'l'}) {
+    # Simulate lsb_release output
+    my ($l,$i,$d,$r,$c) = pb_distro_getlsb($opts{'s'});
+    $sep = " " if (defined $opts{'s'});
+    print $l.$sep;
+    print $i.$sep if (defined $opts{'i'} or defined $opts{'a'});
+    print $d.$sep if (defined $opts{'d'} or defined $opts{'a'});
+    print $r.$sep if (defined $opts{'r'} or defined $opts{'a'});
+    $sep = "" if (defined $opts{'s'});
+    print $c.$sep if (defined $opts{'c'} or defined $opts{'a'});
+    print "\n" if (defined $opts{'s'});
 } else {
-    print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch))."\n";
+    $sep = "," if (defined $opts{'s'});
+    if (not defined $opts{'s'}) {
+        $dos = "OS:\t$dos";
+        $ddir = "Name:\t$ddir";
+        $dver = "Ver:\t$dver";
+        $dfam = "Family:\t$dfam";
+        $dtype = "Type:\t$dtype";
+        $pbsuf = "Suffix:\t$pbsuf";
+        $pbupd = "Update:\t$pbupd";
+        $arch = "Arch:\t$arch";
+        print "Project-Builder tuple:\n";
+    }
+    print join($sep,($dos, $ddir, $dver, $arch, $dtype, $dfam, $pbsuf, $pbupd))."\n";
 }

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

@@ -23 +23 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_distro_conffile pb_distro_init pb_distro_get pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_get_param);
+our @EXPORT = qw(pb_distro_conffile pb_distro_init pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_get_param);
 
 =pod
@@ -226 +226 @@
 }
 
+=item B<pb_distro_getlsb>
+
+This function returns the 5 lsb values LSB version, distribution ID, Description, release and codename.
+As entry it takes an optional parameter to specify whether the output is short or not.
+
+=cut
+
+sub pb_distro_getlsb {
+
+my $s = shift;
+pb_log(3,"Entering pb_distro_getlsb\n");
+
+my ($ambiguous_rel_files) = pb_conf_get("osrelambfile");
+my $lsbf = $ambiguous_rel_files->{"lsb"};
+
+# LSB has not been configured.
+if (not defined $lsbf) {
+    print STDERR "no lsb entry defined for osrelambfile\n";
+    die "You modified upstream delivery and lost !\n";
+}
+
+if (-r $lsbf) {
+    my $rep = pb_get_content($lsbf);
+    # Create elementary fields
+    my ($c, $r, $d, $i, $l) = ("", "", "", "", "");
+    for my $f (split(/\n/,$rep)) {
+        pb_log(3,"Reading file part ***$f***\n");
+        $c = $f if ($f =~ /^DISTRIB_CODENAME/);
+        $c =~ s/DISTRIB_CODENAME=/Codename:\t/;
+        $r = $f if ($f =~ /^DISTRIB_RELEASE/);
+        $r =~ s/DISTRIB_RELEASE=/Release:\t/;
+        $d = $f if ($f =~ /^DISTRIB_DESCRIPTION/);
+        $d =~ s/DISTRIB_DESCRIPTION=/Description:\t/;
+        $d =~ s/"//g;
+        $i = $f if ($f =~ /^DISTRIB_ID/);
+        $i =~ s/DISTRIB_ID=/Distributor ID:\t/;
+        $l = $f if ($f =~ /^LSB_VERSION/);
+        $l =~ s/LSB_VERSION=/LSB Version:\t/;
+    }
+    $c =~ s/^[A-z ]*:[\t ]*// if (defined $s);
+    $r =~ s/^[A-z ]*:[\t ]*// if (defined $s);
+    $d =~ s/^[A-z ]*:[\t ]*// if (defined $s);
+    $i =~ s/^[A-z ]*:[\t ]*// if (defined $s);
+    $l =~ s/^[A-z ]*:[\t ]*// if (defined $s);
+    return($l, $i, $d, $r, $c);
+} else {
+    print STDERR "Unable to read $lsbf file\n";
+    die "Please report to the maintainer bruno_at_project-builder.org\n";
+}
+}
 
 =item B<pb_distro_installdeps>