|
|
@ -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);
|
|
|
|