josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

handle source packages separately from tidy_apt.

Browse source 
git-svn-id: http://emdebian.org/svn/current@8021 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2011-06-15 16:44:08 +00:00
parent a532f5ce75
commit 03483ad805
1 changed files with 55 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
multistrap
View file

@ -379,6 +379,7 @@ if (defined $err and $err != 0) {
} }
&add_extra_packages; &add_extra_packages;
system ("cp $configsh $dir/") if ((defined $configsh) and (-f $configsh)); system ("cp $configsh $dir/") if ((defined $configsh) and (-f $configsh));
&handle_source_packages;
(not defined $tidy) ? system ("apt-get $config_str update") : &tidy_apt; (not defined $tidy) ? system ("apt-get $config_str update") : &tidy_apt;
&guard_lib64($dir); &guard_lib64($dir);
@ -449,9 +450,11 @@ if (not defined $warn_count) {
exit $warn_count; exit $warn_count;
} }
######### sub routine start ##########
sub our_version { sub our_version {
my $query = `dpkg-query -W -f='\${Version}' multistrap 2>/dev/null`; my $query = `dpkg-query -W -f='\${Version}' multistrap 2>/dev/null`;
($query ne "") ? return $query : return "2.1.5"; ($query ne "") ? return $query : return "2.1.15";
} }
sub add_extra_packages { sub add_extra_packages {
@ -549,6 +552,7 @@ sub force_unpack {
$multi = ''; $multi = '';
} }
$src =~ s/ \(.*\)//; $src =~ s/ \(.*\)//;
$src = $pkg if ($src eq "");
push @dsclist, $src; push @dsclist, $src;
mkdir ("./tmp"); mkdir ("./tmp");
my $tmpdir = `mktemp -p ./tmp -d -t multistrap.XXXXXX`; my $tmpdir = `mktemp -p ./tmp -d -t multistrap.XXXXXX`;
@ -749,8 +753,8 @@ sub check_bin_sh {
} }
} }
sub tidy_apt { sub handle_source_packages {
print _g("I: Tidying up apt cache and list data.\n"); return if (not defined $sourcedir);
if ($unpack eq "true") { if ($unpack eq "true") {
opendir (DEBS, "${dir}${cachedir}/archives/") opendir (DEBS, "${dir}${cachedir}/archives/")
or die (_g("Cannot read apt archives directory.\n")); or die (_g("Cannot read apt archives directory.\n"));
@ -762,14 +766,14 @@ sub tidy_apt {
if (defined $sourcedir) { if (defined $sourcedir) {
my $srcname = `LC_ALL dpkg -f ${dir}${cachedir}archives/$file Source`; my $srcname = `LC_ALL dpkg -f ${dir}${cachedir}archives/$file Source`;
chomp ($srcname); chomp ($srcname);
if ($srcname eq "") {
my $srcname = `LC_ALL dpkg -f ${dir}${cachedir}archives/$file Package`;
chomp ($srcname);
}
push @dsclist, $srcname; push @dsclist, $srcname;
system ("mv ${dir}${cachedir}archives/$file $sourcedir/$file");
} else {
unlink ("${dir}${cachedir}archives/$file");
} }
} }
} }
if (defined $sourcedir) {
print "Checking ${dir}${dpkgdir}status\n"; print "Checking ${dir}${dpkgdir}status\n";
if (-f "${dir}${dpkgdir}status") { if (-f "${dir}${dpkgdir}status") {
open (STATUS, "${dir}${dpkgdir}status"); open (STATUS, "${dir}${dpkgdir}status");
@ -797,8 +801,26 @@ sub tidy_apt {
} }
} }
chdir ($olddir); chdir ($olddir);
}
$sourcedir=undef; $sourcedir=undef;
}
sub tidy_apt {
print _g("I: Tidying up apt cache and list data.\n");
if ($unpack eq "true") {
opendir (DEBS, "${dir}${cachedir}/archives/")
or die (_g("Cannot read apt archives directory.\n"));
my @files=grep(!m:\.\.?$:, readdir DEBS);
closedir (DEBS);
foreach my $file (@files) {
next if (-d $file);
next unless ($file =~ /\.deb$/);
if (defined $sourcedir) {
system ("mv ${dir}${cachedir}archives/$file $sourcedir/$file");
} else {
unlink ("${dir}${cachedir}archives/$file");
}
}
}
unlink ("${dir}etc/apt/sources.list") unlink ("${dir}etc/apt/sources.list")
if (-f "${dir}etc/apt/sources.list"); if (-f "${dir}etc/apt/sources.list");
opendir (DEBS, "${dir}${libdir}lists/") opendir (DEBS, "${dir}${libdir}lists/")