Changeset 1661 in ProjectBuilder

Timestamp:

Oct 21, 2012, 2:38:01 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Introduce a pb_exit function and use it in all apps

Location:

devel

Files:

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

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

@@ -40 +40 @@
 
 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_get_osrelease pb_check_requirements pb_check_req pb_path_expand $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_get_osrelease pb_check_requirements pb_check_req pb_path_expand pb_exit $pbdebug $pbLOG $pbdisplaytype $pblocale);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -390 +390 @@
 };
 if ($@) {
-    # No Pod::Usage found not printing usage. Ole perl only
+    # No Pod::Usage found not printing usage. Old perl only
+    pb_exit();
 } else {
     pod2usage(  -message => $pbsynmsg,
@@ -433 +434 @@
     pb_mkdir_p("$ENV{'TMPDIR'}/$template");
 } else {
-    $cleanup = 0 if ($pbdebug >= 1);
+    $cleanup = 0 if ($pbdebug gt 1);
     $ENV{'PBTMP'} = tempdir( "pb.XXXXXXXXXX", DIR => $ENV{'TMPDIR'}, CLEANUP => $cleanup );
 }
@@ -558 +559 @@
 }
 
+
+=item B<pb_exit>
+
+Fundtion to call before exiting pb so cleanup is done
+
+=cut
+
+sub pb_exit {
+
+my $ret = shift || 0;
+pb_log(0,"Please remove manually $ENV{'PBTMP'} after debug analysis\n" if ($pbdebug gt 1);
+exit($ret);
+}
+
 =back 
 

devel/pb/bin/pb

@@ -929 +929 @@
 }
 
+pb_exit();
+
 sub pb_cms2build {
 

devel/pbmkbm/bin/pbmkbm

@@ -383 +383 @@
 pb_log(1,"End: $pbdate\n");
 
+pb_exit();
+
 sub pb_mkbm_create_content {
 

devel/rpmbootstrap/bin/rpmbootstrap

@@ -435 +435 @@
 # Stop here if we just print
 if ($opts{'p'}) {
-    exit(0);
+    pb_exit(0);
 }
 
@@ -629 +629 @@
 }
 
+pb_exit();
+
 # Function for File::Find
 sub unlink_old_conf {