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

Clean up component support and ensure a sane default exists.

Browse source 
git-svn-id: http://emdebian.org/svn/current@6778 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2010-03-04 09:43:49 +00:00
parent ddeb26f5f2
commit aec6c41752
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
emdebian-rootfs (2.0.6) unstable; urgency=low
* Clean up component support and ensure a sane default exists.
-- Neil Williams <codehelp@debian.org> Thu, 04 Mar 2010 09:26:21 +0000
emdebian-rootfs (2.0.5) unstable; urgency=low emdebian-rootfs (2.0.5) unstable; urgency=low
* Add shortcut conf files * Add shortcut conf files

8
em_multistrap
View file

@ -117,7 +117,7 @@ foreach $section (sort keys %keys)
$packages{$section}=$keys{$section}{'packages'}; $packages{$section}=$keys{$section}{'packages'};
$suites{$section}=$keys{$section}{'suite'}; $suites{$section}=$keys{$section}{'suite'};
$components{$section}=$keys{$section}{'components'}; $components{$section}=$keys{$section}{'components'};
if (not exists $components{$section}) if (not defined $components{$section})
{ {
$components{$section}='main'; $components{$section}='main';
} }
@ -253,7 +253,7 @@ foreach my $aptsrc (@aptsources)
or die _g("Cannot open sources list"). $!; or die _g("Cannot open sources list"). $!;
$mirror = $sources{$aptsrc}; $mirror = $sources{$aptsrc};
$suite = $suites{$aptsrc}; $suite = $suites{$aptsrc};
$component = $components{$aptsrc}; $component = (defined $components{$aptsrc}) ? $components{$aptsrc} : "main";
print SOURCES<<END; print SOURCES<<END;
deb $mirror $suite $component deb $mirror $suite $component
deb-src $mirror $suite $component deb-src $mirror $suite $component
@ -298,9 +298,9 @@ die (sprintf (_g("apt update failed. Exit value: %d\n"), ($retval/256)))
my $required = &get_required_debs; my $required = &get_required_debs;
$str = join (' ', @$required); $str = join (' ', @$required);
chomp($str); chomp($str);
$str .= join (' ', values %packages) . " "; $str .= " " . join (' ', values %packages) . " ";
chomp($str); chomp($str);
$str .= join (' ', values %keyrings) . " "; $str .= " " . join (' ', values %keyrings) . " ";
chomp($str); chomp($str);
my %uniq=(); my %uniq=();
my @s = split (' ', $str); my @s = split (' ', $str);