From 5da4e83ef99187ac99366538f21b713e18ddc9af Mon Sep 17 00:00:00 2001 From: codehelp Date: Sat, 15 May 2010 17:17:39 +0000 Subject: [PATCH] fix tidy_up mode in cascade git-svn-id: http://emdebian.org/svn/current@7213 563faec7-e20c-0410-992a-a66f704d0ccd --- multistrap | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/multistrap b/multistrap index 8ee739b..341b99b 100755 --- a/multistrap +++ b/multistrap @@ -676,10 +676,11 @@ sub tidy_apt { next if (-d $file); next unless ($file =~ /\.deb$/); - (defined $sourcedir) ? - system ("mv ${dir}${cachedir}archives/$file $sourcedir/$file") : - unlink ("${dir}${cachedir}archives/$file"); - ; + if (defined $sourcedir) { + system ("mv ${dir}${cachedir}archives/$file $sourcedir/$file"); + } else { + unlink ("${dir}${cachedir}archives/$file"); + } } } } @@ -895,8 +896,7 @@ sub cascade if (defined $keys{$section}{'omitpreinst'} and (not defined $omitpreinst)); $tidy++ if ((defined $keys{$section}{'cleanup'}) and - ($keys{$section}{'cleanup'} eq "true") and - (defined $tidy)); + ($keys{$section}{'cleanup'} eq "true")); $noauth++ if ((defined $keys{$section}{'noauth'}) and ($keys{$section}{'noauth'} eq "true")); $sourcedir = $keys{$section}{'retainsources'} if