Changeset 1546


Ignore:
Timestamp:
May 16, 2012, 2:42:03 PM (7 years ago)
Author:
bruno
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:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r1545 r1546  
    14421442            chdir "$pbpkg-$pbver$pbextdir" || die "Unable to chdir to $pbpkg-$pbver$pbextdir";
    14431443            pb_rm_rf("debian");
    1444             symlink "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}","debian" || die "Unable to symlink to pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
     1444            my $confdir = "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
     1445            die "Configuration directory $confdir is not a directory" if (not -d $confdir);
     1446            symlink "$confdir","debian" || die "Unable to symlink 'debian' to $confdir";
    14451447            chmod 0755,"debian/rules";
    14461448
     
    14551457                $debsrcfmt = pb_get_content($debsrcfile);
    14561458            }
    1457                
     1459
    14581460            if ($debsrcfmt =~ /^3.*quilt/) {
    14591461                # If we use quilt to manage patches, we then setup the env correctly
     
    27122714    }
    27132715
     2716    print SCRIPT q{echo "********** Successful exit of script $$ *********************"}, "\n";
    27142717    close(SCRIPT);
    27152718    chmod 0755,"$ENV{'PBDESTDIR'}/pbscript.$$";
Note: See TracChangeset for help on using the changeset viewer.