|
|
|
@ -503,11 +503,6 @@ sub shellescape {
|
|
|
|
|
return "'$string'";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sub our_version {
|
|
|
|
|
my $query = `dpkg-query -W -f='\${Version}' multistrap 2>/dev/null`;
|
|
|
|
|
($query ne "") ? return $query : return "2.1.15";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sub add_extra_packages {
|
|
|
|
|
my $apt_get = shift;
|
|
|
|
|
my $cachedir = shift;
|
|
|
|
@ -1325,13 +1320,6 @@ sub cascade {
|
|
|
|
|
uniq_sort (\@extrapkgs);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# returns zero on success, non-zero on fail
|
|
|
|
|
sub check_multiarch_dpkg {
|
|
|
|
|
my $retval = system ("dpkg --print-foreign-architectures > /dev/null 2>&1");
|
|
|
|
|
$retval >>=8;
|
|
|
|
|
return $retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sub system_fatal {
|
|
|
|
|
my $cmd = shift;
|
|
|
|
|
my $retval = system ("$cmd");
|
|
|
|
|