Changeset 1546 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

May 16, 2012, 2:42:03 PM (12 years ago)

Author:

Bruno Cornec

Message:

• pb: Error out if the target configuration directory isn't present. The failure was occuring in a later pbmkdir_p, but this is the better place to fix things. Also print out a big "we completed successfully" message to help with debugging. (Eric Anderson)

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -1442 +1442 @@
             chdir "$pbpkg-$pbver$pbextdir" || die "Unable to chdir to $pbpkg-$pbver$pbextdir";
             pb_rm_rf("debian");
-            symlink "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}","debian" || die "Unable to symlink to pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
+            my $confdir = "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
+            die "Configuration directory $confdir is not a directory" if (not -d $confdir);
+            symlink "$confdir","debian" || die "Unable to symlink 'debian' to $confdir";
             chmod 0755,"debian/rules";
 
@@ -1455 +1457 @@
                 $debsrcfmt = pb_get_content($debsrcfile);
             }
-                
+
             if ($debsrcfmt =~ /^3.*quilt/) {
                 # If we use quilt to manage patches, we then setup the env correctly 
@@ -2712 +2714 @@
     }
 
+    print SCRIPT q{echo "********** Successful exit of script $$ *********************"}, "\n";
     close(SCRIPT);
     chmod 0755,"$ENV{'PBDESTDIR'}/pbscript.$$";