fix tidy_up mode in cascade
git-svn-id: http://emdebian.org/svn/current@7213 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
parent
8960b0de2a
commit
5da4e83ef9
1 changed files with 6 additions and 6 deletions
10
multistrap
10
multistrap
|
@ -676,10 +676,11 @@ sub tidy_apt
|
||||||
{
|
{
|
||||||
next if (-d $file);
|
next if (-d $file);
|
||||||
next unless ($file =~ /\.deb$/);
|
next unless ($file =~ /\.deb$/);
|
||||||
(defined $sourcedir) ?
|
if (defined $sourcedir) {
|
||||||
system ("mv ${dir}${cachedir}archives/$file $sourcedir/$file") :
|
system ("mv ${dir}${cachedir}archives/$file $sourcedir/$file");
|
||||||
|
} else {
|
||||||
unlink ("${dir}${cachedir}archives/$file");
|
unlink ("${dir}${cachedir}archives/$file");
|
||||||
;
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -895,8 +896,7 @@ sub cascade
|
||||||
if (defined $keys{$section}{'omitpreinst'}
|
if (defined $keys{$section}{'omitpreinst'}
|
||||||
and (not defined $omitpreinst));
|
and (not defined $omitpreinst));
|
||||||
$tidy++ if ((defined $keys{$section}{'cleanup'}) and
|
$tidy++ if ((defined $keys{$section}{'cleanup'}) and
|
||||||
($keys{$section}{'cleanup'} eq "true") and
|
($keys{$section}{'cleanup'} eq "true"));
|
||||||
(defined $tidy));
|
|
||||||
$noauth++ if ((defined $keys{$section}{'noauth'}) and
|
$noauth++ if ((defined $keys{$section}{'noauth'}) and
|
||||||
($keys{$section}{'noauth'} eq "true"));
|
($keys{$section}{'noauth'} eq "true"));
|
||||||
$sourcedir = $keys{$section}{'retainsources'} if
|
$sourcedir = $keys{$section}{'retainsources'} if
|
||||||
|
|
Loading…
Reference in a new issue