Changeset 29

Timestamp:

08/02/07 00:36:11 (6 years ago)

Author:

bruno

Message:

Use pbsystem everywhere

Location:

devel/pb

Files:

• bin/pb.pl (modified) (5 diffs)
• lib/common.pm (modified) (1 diff)

devel/pb/bin/pb.pl

@@ -115 +115 @@
         # And generate some additional files
         $OUTPUT_AUTOFLUSH=1;
-        print $LOG "$ENV{'PBCMSEXP'} of $pbpkg..." if ($debug >= 0);
+
         # computes in which dir we have to work
         my $dir = $defpkgdir{$pbpkg};
         $dir = $extpkgdir{$pbpkg} if (not defined $dir);
-        system("$ENV{'PBCMSEXP'} $option $ENV{'PBROOT'}/$dir $dest 1>/dev/null");
-        if ($? == -1) {
-            print $LOG "failed to execute: $!\n" if ($debug >= 0);
-        } elsif ($? & 127) {
-            printf $LOG "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
-        } else {
-            print $LOG " OK\n" if ($debug >= 0);
-        }
+        pbsystem("$ENV{'PBCMSEXP'} $option $ENV{'PBROOT'}/$dir $dest 1>/dev/null", "Exporting $ENV{'PBROOT'}/$dir... ");
 
         # Creates a REVISION file
@@ -134 +127 @@
 
         # Extract cms log history and store it
-        system("$ENV{'PBCMSLOG'} $option $ENV{'PBROOT'}/$dir > $dest/$ENV{'PBCMSLOGFILE'}");
-        print $LOG "$ENV{'PBCMSLOG'} of $pbpkg..." if ($debug >= 0);
-        if ($? == -1) {
-            print $LOG "failed to execute: $!\n" if ($debug >= 0);
-        } elsif ($? & 127) {
-            printf $LOG "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
-        } else {
-            print $LOG " OK\n" if ($debug >= 0);
-        }
+        pbsystem("$ENV{'PBCMSLOG'} $option $ENV{'PBROOT'}/$dir > $dest/$ENV{'PBCMSLOGFILE'}", "Extracting log info... ");
+
         my %build;
         open(D,"$ENV{'PBCONF'}/DISTROS") || die "Unable to find $ENV{'PBCONF'}/DISTROS\n";
@@ -257 +243 @@
         # Prepare the dest directory for archive
         if (-x "$ENV{'PBCONF'}/$pbpkg/pbpkginit") {
-            print $LOG " Executing $ENV{'PBCONF'}/$pbpkg/pbinit...\n" if ($debug >= 0);
-            system("cd $dest ; $ENV{'PBCONF'}/$pbpkg/pbinit");
-            if ($? == -1) {
-                print $LOG "failed to execute: $!\n" if ($debug >= 0);
-            } elsif ($? & 127) {
-                printf $LOG "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
-            } else {
-                print $LOG " OK\n" if ($debug >= 0);
-            }
-        }
+            pbsystem("cd $dest ; $ENV{'PBCONF'}/$pbpkg/pbinit","Executing init script $ENV{'PBCONF'}/$pbpkg/pbinit");
+        }
+
         # Archive dest dir
         chdir "$ENV{'PBDESTDIR'}";
-        print $LOG "Creating $pbpkg tar files (gzip... " if ($debug >= 0);
         # Possibility to look at PBSRC to guess more the filename
-        system("tar cfphz $pbpkg-$pbver.tar.gz $pbpkg-$pbver");
+        pbsystem("tar cfphz $pbpkg-$pbver.tar.gz $pbpkg-$pbver","Creating $pbpkg tar files (gzip... ");
         if ($? == -1) {
             print $LOG "failed to execute: $!\n" if ($debug >= 0);
@@ -332 +310 @@
             foreach my $f (@specfile) {
                 if ($f =~ /\.spec$/) {
-                    print $LOG "rpmbuild -ba $f ...\n";
-                    system("rpmbuild -ba $f");
+                    pbsystem("rpmbuild -ba $f","Building package with $f... ");
                     last;
                 }
@@ -418 +395 @@
 my @files;
 
-print $LOG "Extracting build files... " if ($debug >= 0);
-system("tar xfz $src $dir >/dev/null");
-if ($? == -1) {
-    print $LOG "failed to execute: $!\n" if ($debug >= 0);
-} elsif ($? & 127) {
-    printf $LOG "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
-} else {
-    print $LOG " OK\n" if ($debug >= 0);
-}
+pbsystem("tar xfz $src $dir >/dev/null","Extracting build files... ");
 opendir(DIR,"$dir") || die "Unable to open directory $dir";
 foreach my $f (readdir(DIR)) {

devel/pb/lib/common.pm

@@ -118 +118 @@
 
 sub pbmkdir_p {
-    my @dir = @_;
-    my $ret = mkpath(@dir, 0, 0755);
-    return($ret);
+my @dir = @_;
+my $ret = mkpath(@dir, 0, 0755);
+return($ret);
 }
 
 sub pbrm_rf {
-    my @dir = @_;
-    my $ret = rmtree(@dir, 0, 0);
-    return($ret);
+my @dir = @_;
+my $ret = rmtree(@dir, 0, 0);
+return($ret);
 }
 
+sub pbsystem {
+
+my $cmd=shift;
+my $cmt=shift || $cmt=$cmd;
+
+print $LOG "$cmt ...";
+system("$cmd");
+if ($? == -1) {
+    print $LOG "failed to execute: $!\n" if ($debug >= 0);
+} elsif ($? & 127) {
+    printf $LOG "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
+} else {
+    print $LOG " OK\n" if ($debug >= 0);
+}
 1;