summaryrefslogtreecommitdiff
path: root/dh
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-04-23 21:54:13 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-04-23 21:54:13 -0400
commit28f84cd5c972f683506bee5f201cd93a2c09ee56 (patch)
treeffa603b354cfaabd6ad48adf9a5920356b4d0ac9 /dh
parent51aad7820f9c090b7bb96ac2541c63d0203abff8 (diff)
log file loading bug fixes
Diffstat (limited to 'dh')
-rwxr-xr-xdh4
1 files changed, 2 insertions, 2 deletions
diff --git a/dh b/dh
index 793146e..ab814d7 100755
--- a/dh
+++ b/dh
@@ -286,6 +286,7 @@ while (@ARGV_orig) {
my %logged;
my %startpoint;
foreach my $package (@{$dh{DOPACKAGES}}) {
+ my @log=loadlog($package);
if ($dh{AFTER}) {
# Run commands in the sequence that come after the
# specified command.
@@ -300,7 +301,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
# Find the last logged command that is in the sequence, and
# continue with the next command after it. If no logged
# command is in the sequence, we're starting at the beginning..
- my @log=loadlog($package);
$startpoint{$package}=0;
COMMAND: foreach my $command (reverse @log) {
foreach my $i (0..$#sequence) {
@@ -381,7 +381,7 @@ sub loadlog {
my $ext=pkgext($package);
my @log;
- open(LOG, "<", "debian/${ext}debhelper.log");
+ open(LOG, "<", "debian/${ext}debhelper.log") || return;
while (<LOG>) {
chomp;
push @log, $_;