Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- /usr/sbin/multistrap 2011-08-14 15:22:41.000000000 +0200
- +++ /usr/sbin/multistrap.local 2011-10-16 23:59:54.000000000 +0200
- @@ -36,7 +36,7 @@
- $explicit_suite $allow_recommends %omitdebsrc @dsclist @sectoutput
- %flatfile %important $addimportant @debconf $hookdir %hooks
- $warn_count $use_shortcut @foreignarches $olddpkg
- - %foreignpkgs /;
- + %foreignpkgs $defaultrelease /;
- setlocale(LC_MESSAGES, "");
- textdomain("multistrap");
- @@ -323,7 +323,12 @@
- $config_str .= " -o Apt::Get::Download-Only=true";
- $config_str .= " -o Apt::Install-Recommends=false";
- $config_str .= " -o Dir=$dir";
- -$config_str .= " -o Dir::Etc=${dir}${etcdir} -o APT::Default-Release=*";
- +$config_str .= " -o Dir::Etc=${dir}${etcdir}";
- +$config_str .= " -o APT::Default-Release=$defaultrelease"
- + if (defined $defaultrelease);
- +$config_str .= " -o APT::Default-Release=*"
- + if (not defined $defaultrelease);
- +
- if (defined $deflist) {
- $sourcesname = "sources.list.d/multistrap.sources.list";
- $config_str .= " -o Dir::Etc::SourceList=${dir}${etcdir}$sourcesname";
- @@ -944,6 +949,11 @@
- or die sprintf(_g("Cannot open %s directory. %s\n"),
- "${dir}${libdir}lists/", $!);
- my @lists=grep(/_Packages$/, readdir (PKGS));
- +
- + # install required only from default release. Maybe should we use an option for that
- + @lists=grep(/_$defaultrelease$/, readdir (PKGS))
- + if (defined $defaultrelease);
- +
- closedir (PKGS);
- foreach my $strap (@debootstrap) {
- my $s = lc($strap);
- @@ -1111,6 +1121,8 @@
- ($keys{$section}{'explicitsuite'} eq "true"));
- $allow_recommends++ if ((defined $keys{$section}{'allowrecommends'}) and
- ($keys{$section}{'allowrecommends'} eq "true"));
- + $defaultrelease = $keys{$section}{'defaultrelease'}
- + if (defined $keys{$section}{'defaultrelease'} and (not defined $defaultrelease));
- my @p = split(' ', lc($keys{$section}{'debconfseed'}))
- if (defined $keys{$section}{'debconfseed'});
- foreach my $f (@p) {
- @@ -1407,6 +1419,9 @@
- if (defined $tgzname) {
- printf ("tarballname:\t\t"._g("Tarball name: '%s'\n"), $tgzname);
- }
- + if (defined $defaultrelease) {
- + printf ("defaultrelease:\t\t"._g("Default release: '%s'\n"), $defaultrelease);
- + }
- print "\n";
- if (defined $msg) {
- warn ("\n$msg\n");
Add Comment
Please, Sign In to add comment