Changeset 89 in ProjectBuilder

Timestamp:

Sep 3, 2007, 4:47:47 PM (18 years ago)

Author:

Bruno Cornec

Message:

Better interface for pb_get functions

Location:

devel/pb

Files:

• bin/pb (modified) (5 diffs)
• lib/ProjectBuilder/Base.pm (modified) (7 diffs)
• lib/ProjectBuilder/Changelog.pm (modified) (2 diffs)

devel/pb/bin/pb

@@ -261 +261 @@
             close(PKG);
         }
-        my $pkg = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
+        my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
         $pkg = { } if (not defined $pkg);
         if ((not defined $pkg->{$pbpkg}) || ($pkg->{$pbpkg} ne "$pbver-$pbtag")) {
@@ -287 +287 @@
 
     # Get content saved in cms2build
-    my $pkg = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
+    my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
     $pkg = { } if (not defined $pkg);
 
@@ -348 +348 @@
 
     # Get content saved in cms2build
-    my $pkg = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
+    my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
     $pkg = { } if (not defined $pkg);
 
@@ -361 +361 @@
         push @src, $src;
     }
-    my $pt = pb_conf_get("sshhost", "sshlogin", "sshdir");
+    my ($pt) = pb_conf_get("sshhost", "sshlogin", "sshdir");
     my ($sshhost,$sshlogin,$sshdir) = @$pt;
     my $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$sshhost->{$ENV{'PBPROJ'}}";
     my $dir = "$sshdir->{$ENV{'PBPROJ'}}/src";
-    pb_system("ssh -q $mac \"mkdir -p $dir","Preparing $dir on $mac");
+    pb_system("ssh -q $mac \"mkdir -p $dir\"","Preparing $dir on $mac");
     pb_system("scp -p ".join(' ',@src)." $mac:$dir","Source delivery in $dir on $mac");
 }
@@ -380 +380 @@
 
     # Get content saved in cms2build
-    my $pkg = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
+    my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
     $pkg = { } if (not defined $pkg);
 

devel/pb/lib/ProjectBuilder/Base.pm

@@ -37 +37 @@
 # and use its content
 #
-my $pbrc = pb_conf_read("$ENV{'PBETC'}","pbrc");
+my ($pbrc) = pb_conf_read("$ENV{'PBETC'}","pbrc");
 print "DEBUG pbrc: ".Dumper($pbrc)."\n" if ($debug >= 1);
 
@@ -60 +60 @@
 if (not defined $ENV{'PBROOT'}) {
     if (-f $pbrc{$proj}) {
-        my $pbroot = pb_conf_read($pbrc{$proj},"pbroot");
+        my ($pbroot) = pb_conf_read($pbrc{$proj},"pbroot");
         my %pbroot = %$pbroot;
         # All lines should point to the same pbroot so take the first
@@ -82 +82 @@
     # Valid version names (optional)
     # List of files to filter (optional)
-    my $ptr = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","defpkgdir","extpkgdir","version","filteredfiles");
-    my ($defpkgdir, $extpkgdir, $version, $filteredfiles) = @$ptr;
+    my ($defpkgdir, $extpkgdir, $version, $filteredfiles) = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","defpkgdir","extpkgdir","version","filteredfiles");
     print "DEBUG: defpkgdir: ".Dumper($defpkgdir)."\n" if ($debug >= 1);
     print "DEBUG: extpkgdir: ".Dumper($extpkgdir)."\n" if ($debug >= 1);
@@ -199 +198 @@
 my @param = @_;
 
-my $ptr = pb_conf_read("$ENV{'PBETC'}", @param);
-my @ptr;
-if ($#param == 0) {
-    push @ptr, $ptr;
-} else {
-    @ptr = @$ptr;
-}
+my @ptr = pb_conf_read("$ENV{'PBETC'}", @param);
+
 foreach my $i (0..$#param) {
     die "No $param[$i] defined for $ENV{'PBPROJ'}" if (not defined $ptr[$i]);
@@ -212 +206 @@
     die "No $param[$i] defined for $ENV{'PBPROJ'}" if (not defined $p->{$ENV{'PBPROJ'}});
 }
-if ($#param == 0) {
-    print "DEBUG: param: ".Dumper($ptr[0])."\n" if ($debug >= 1);
-    return($ptr[0]);
-} else {
-    my $ptr = \@ptr;
-    print "DEBUG: param: ".Dumper($ptr)."\n" if ($debug >= 1);
-    return($ptr);
-}
+print "DEBUG: param: ".Dumper($ptr)."\n" if ($debug >= 1);
+return(@ptr);
 }
 
@@ -251 +239 @@
     push @ptr,$config->get($param);
 }
-if ($#param == 0) {
-    print "DEBUG: param: $param[0] ".Dumper($ptr[0])."\n" if ($debug >= 1);
-    return($ptr[0]);
-} else {
-    my $ptr = \@ptr;
-    print "DEBUG: params: ".Dumper(@param)." ".Dumper($ptr)."\n" if ($debug >= 1);
-    return($ptr);
-}
+print "DEBUG: params: ".Dumper(@param)." ".Dumper(@ptr)."\n" if ($debug >= 1);
+return(@ptr);
 }
 
@@ -267 +249 @@
 my $ret;
 
-my $cms = pb_conf_get("cms");
+my ($cms) = pb_conf_get("cms");
 # This one is optional
-my $cvsroot = pb_conf_read($ENV{'PBETC'},"cvsroot");
+my ($cvsroot) = pb_conf_read($ENV{'PBETC'},"cvsroot");
 
 if ($cms->{$proj} eq "svn") {

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -10 +10 @@
 use File::Basename;
 use English;
-use ProjectBuilder::Base qw (pb_conf_read _conf_get);
+use ProjectBuilder::Base qw (pb_conf_get);
 
 sub pb_changelog {
@@ -66 +66 @@
     my $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
     #print "**$ndate**\n";
-    my $packager = pb_conf_get("packager");
+    my ($packager) = pb_conf_get("packager");
 
     if (($dtype eq "rpm") || ($dtype eq "fc")) {