Changeset 1127 in ProjectBuilder

Timestamp:

Dec 21, 2010, 2:37:35 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Modify pb_check_req interface to return the found value and allow direct call
• Use pb_check_req to avoid some hardcoded path

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Base.pm (modified) (3 diffs)
• pb/bin/pb (modified) (2 diffs)
• pb/lib/ProjectBuilder/CMS.pm (modified) (3 diffs)
• rpmbootstrap/bin/rpmbootstrap (modified) (1 diff)

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

@@ -37 +37 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_get_uri pb_get_content pb_set_content pb_display_file pb_syntax_init pb_syntax pb_temp_init pb_get_arch pb_check_requirements $pbdebug $pbLOG $pbdisplaytype $pblocale);
+our @EXPORT = qw(pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_get_uri pb_get_content pb_set_content pb_display_file pb_syntax_init pb_syntax pb_temp_init pb_get_arch pb_check_requirements pb_check_req $pbdebug $pbLOG $pbdisplaytype $pblocale);
 
 =pod
@@ -423 +423 @@
 }
 
+=item B<pb_check_req>
+
+This function checks existence of a command and return its full pathname.
+The command name is passed as first parameter.
+The second parameter should be 0 if the command is mandatory, 1 if optional.
+
+=cut
+
 sub pb_check_req {
 
 my $file = shift;
 my $opt = shift || 1;
-my $found = 0;
+my $found = undef;
 
 pb_log(2,"Checking availability of $file...");
 # Check for all dirs in the PATH
 foreach my $p (split(/:/,$ENV{'PATH'})) {
-    $found = 1 if (-x "$p/$file");
-}
-if ($found eq 0) {
+    if (-x "$p/$file") {
+        $found =  "$p/$file";
+        last;
+    }
+}
+
+if (not $found) {
     pb_log(2,"KO\n");
     if ($opt eq 1) {
@@ -443 +455 @@
 } else {
     pb_log(2,"OK\n");
+    return($found");
 }
 }

devel/pb/bin/pb

@@ -1951 +1951 @@
                 die("Found an existing Virtual machine $vmm. Won't overwrite") if (-r $vmm);
                 if (($vmtype eq "qemu") || ($vmtype eq "xen") || ($vmtype eq "kvm")) {
-                    pb_system("/usr/bin/qemu-img create -f qcow2 $vmm $vmsize->{$ENV{'PBPROJ'}}","Creating the QEMU VM");
+                    my $command = pb_check_req("qemu-img",0);
+                    pb_system("$command create -f qcow2 $vmm $vmsize->{$ENV{'PBPROJ'}}","Creating the QEMU VM");
                 } elsif ($vmtype eq "vmware") {
                 } else {
@@ -2059 +2060 @@
                             $addpkgs = "-a $postparam";
                         }
-                        pb_system("sudo /usr/bin/rpmbootstrap $rbsopt $postinstall $addpkgs $ddir-$dver-$darch $rbsverb","Creating the rpmbootstrap VE for $ddir-$dver ($darch)", "verbose");
+                        my $command = pb_check_req("rpmbootstrap",0);
+                        pb_system("sudo $command $rbsopt $postinstall $addpkgs $ddir-$dver-$darch $rbsverb","Creating the rpmbootstrap VE for $ddir-$dver ($darch)", "verbose");
                     } elsif ($verpmstyle eq "mock") {
                         my ($rbsconf) = pb_conf_get("rbsconf");
-                        pb_system("sudo /usr/sbin/mock --init --resultdir=\"/tmp\" --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v $rbsopt","Creating the mock VE for $ddir-$dver ($darch)");
+                        my $command = pb_check_req("mock",0);
+                        pb_system("sudo $command --init --resultdir=\"/tmp\" --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v $rbsopt","Creating the mock VE for $ddir-$dver ($darch)");
                         # Once setup we need to install some packages, the pb account, ...
-                        pb_system("sudo /usr/sbin/mock --install --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v su","Configuring the mock VE");
+                        pb_system("sudo $command --install --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v su","Configuring the mock VE");
                     } else {
                         die "Unknown verpmtype type $verpmstyle. Report to dev team";

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -798 +798 @@
         open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
         close(CL);
-        if (-x "/usr/bin/svn2cl") {
-            pb_system("/usr/bin/svn2cl --group-by-day --authors=$authors -i -o $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN with svn2cl");
+        my $command = pb_check_req("svn2cl",1);
+        if (-x $command) {
+            pb_system("$command --group-by-day --authors=$authors -i -o $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN with svn2cl");
         } else {
             # To be written from pbcl
@@ -824 +825 @@
         open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
         close(CL);
-        if (-x "/usr/bin/cvs2cl") {
-            pb_system("/usr/bin/cvs2cl --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from CVS with cvs2cl");
+        my $command = pb_check_req("cvs2cl",1);
+        if (-x $command) {
+            pb_system("$command --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from CVS with cvs2cl");
         } else {
             # To be written from pbcl
@@ -882 +884 @@
     return($cmd."cvs")
 } elsif (($scheme =~ /http/) || ($scheme =~ /ftp/)) {
-    if (-x "/usr/bin/wget") {
-        return($cmd."/usr/bin/wget -nv -O ");
-    } elsif (-x "/usr/bin/curl") {
-        return($cmd."/usr/bin/curl -o ");
-    } else {
-        die "Unable to handle $scheme.\nNo wget/curl available, please install one of those";
+    my $command = pb_check_req("wget",1);
+    if (-x $command) {
+        return($cmd."$command -nv -O ");
+    } else {
+        $command = pb_check_req("curl",1);
+        if (-x $command) {
+            return($cmd."$command -o ");
+        } else {
+            die "Unable to handle $scheme.\nNo wget/curl available, please install one of those";
+        }
     }
 } else {

devel/rpmbootstrap/bin/rpmbootstrap

@@ -546 +546 @@
     unlink($_) if ($_ =~ /\.rpmnew$/);
 }
-
-