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

Allow uppercase letters in paths (closes: #751896)

Browse source
This commit is contained in:
Johannes Schauer 2016-12-03 16:25:38 +01:00 committed by Johannes 'josch' Schauer
parent 5c106953dc
commit 4067756e25
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -10,6 +10,7 @@ multistrap (2.2.2) UNRELEASED; urgency=medium
location (fixes lintian warning about deprecated /etc/bash_completion.d/) location (fixes lintian warning about deprecated /etc/bash_completion.d/)
* Do not try to feed GPG keybox database version 1 files to apt (closes: * Do not try to feed GPG keybox database version 1 files to apt (closes:
#845963) #845963)
* Allow uppercase letters in paths (closes: #751896)
-- Johannes Schauer <josch@debian.org> Fri, 02 Dec 2016 23:25:07 +0100 -- Johannes Schauer <josch@debian.org> Fri, 02 Dec 2016 23:25:07 +0100

20
multistrap
View file

@ -1163,9 +1163,9 @@ sub cascade {
$unpack = "false" if (defined $keys{$section}{'forceunpack'} and (lc($keys{$section}{'forceunpack'}) ne "true")); $unpack = "false" if (defined $keys{$section}{'forceunpack'} and (lc($keys{$section}{'forceunpack'}) ne "true"));
$unpack = "false" if (defined $keys{$section}{'unpack'} and (lc($keys{$section}{'unpack'} ne "true"))); $unpack = "false" if (defined $keys{$section}{'unpack'} and (lc($keys{$section}{'unpack'} ne "true")));
$markauto++ if ((defined $keys{$section}{'markauto'}) and (lc($keys{$section}{'markauto'}) eq "true")); $markauto++ if ((defined $keys{$section}{'markauto'}) and (lc($keys{$section}{'markauto'}) eq "true"));
$configsh = lc($keys{$section}{'configscript'}) $configsh = $keys{$section}{'configscript'}
if (defined $keys{$section}{'configscript'} and (not defined $configsh)); if (defined $keys{$section}{'configscript'} and (not defined $configsh));
$tgzname = lc($keys{$section}{'tarballname'}) $tgzname = $keys{$section}{'tarballname'}
if (defined $keys{$section}{'tarballname'} and (not defined $tgzname)); if (defined $keys{$section}{'tarballname'} and (not defined $tgzname));
chomp($tgzname) if (defined $tgzname); chomp($tgzname) if (defined $tgzname);
undef $tgzname if (defined $tgzname and $tgzname eq ''); undef $tgzname if (defined $tgzname and $tgzname eq '');
@ -1178,7 +1178,7 @@ sub cascade {
warn $configmsg; warn $configmsg;
$warn_count++; $warn_count++;
} }
$setupsh = lc($keys{$section}{'setupscript'}) $setupsh = $keys{$section}{'setupscript'}
if (defined $keys{$section}{'setupscript'} and (not defined $setupsh)); if (defined $keys{$section}{'setupscript'} and (not defined $setupsh));
undef $setupsh if ((defined $setupsh) and (not -x $setupsh)); undef $setupsh if ((defined $setupsh) and (not -x $setupsh));
$omitrequired++ if (defined $keys{$section}{'omitrequired'} and (lc($keys{$section}{'omitrequired'}) eq "true")); $omitrequired++ if (defined $keys{$section}{'omitrequired'} and (lc($keys{$section}{'omitrequired'}) eq "true"));
@ -1188,7 +1188,7 @@ sub cascade {
$noauth++ if ((defined $keys{$section}{'noauth'}) and ($keys{$section}{'noauth'} eq "true")); $noauth++ if ((defined $keys{$section}{'noauth'}) and ($keys{$section}{'noauth'} eq "true"));
$ignorenative++ if ((defined $keys{$section}{'ignorenativearch'}) and $ignorenative++ if ((defined $keys{$section}{'ignorenativearch'}) and
(lc($keys{$section}{'ignorenativearch'}) eq 'true')); (lc($keys{$section}{'ignorenativearch'}) eq 'true'));
$preffile = lc($keys{$section}{'aptpreferences'}) $preffile = $keys{$section}{'aptpreferences'}
if (defined $keys{$section}{'aptpreferences'} and (not defined $preffile)); if (defined $keys{$section}{'aptpreferences'} and (not defined $preffile));
undef $preffile if ((defined $preffile) and (not -f $preffile)); undef $preffile if ((defined $preffile) and (not -f $preffile));
$sourcedir = $keys{$section}{'retainsources'} $sourcedir = $keys{$section}{'retainsources'}
@ -1197,9 +1197,9 @@ sub cascade {
($keys{$section}{'explicitsuite'} eq "true")); ($keys{$section}{'explicitsuite'} eq "true"));
$allow_recommends++ if ((defined $keys{$section}{'allowrecommends'}) and $allow_recommends++ if ((defined $keys{$section}{'allowrecommends'}) and
($keys{$section}{'allowrecommends'} eq "true")); ($keys{$section}{'allowrecommends'} eq "true"));
$default_release = lc($keys{$section}{'aptdefaultrelease'}) $default_release = $keys{$section}{'aptdefaultrelease'}
if (defined $keys{$section}{'aptdefaultrelease'}); if (defined $keys{$section}{'aptdefaultrelease'});
my @p = split(' ', lc($keys{$section}{'debconfseed'})) my @p = split(' ', $keys{$section}{'debconfseed'})
if (defined $keys{$section}{'debconfseed'}); if (defined $keys{$section}{'debconfseed'});
foreach my $f (@p) { foreach my $f (@p) {
my $fl = realpath ($f); my $fl = realpath ($f);
@ -1208,7 +1208,7 @@ sub cascade {
chomp ($fl); chomp ($fl);
push @debconf, $fl; push @debconf, $fl;
} }
my @h = split(' ', lc($keys{$section}{'hookdir'})) my @h = split(' ', $keys{$section}{'hookdir'})
if (defined $keys{$section}{'hookdir'}); if (defined $keys{$section}{'hookdir'});
foreach my $f (@h) { foreach my $f (@h) {
opendir (HOOKS, "$f") or next; opendir (HOOKS, "$f") or next;
@ -1224,7 +1224,7 @@ sub cascade {
} }
my @ma=(); my @ma=();
if ($olddpkg == 0) { if ($olddpkg == 0) {
@ma = split(' ',lc($keys{$section}{'multiarch'})) @ma = split(' ',$keys{$section}{'multiarch'})
if (defined $keys{$section}{'multiarch'}); if (defined $keys{$section}{'multiarch'});
} }
push @foreignarches, @ma; push @foreignarches, @ma;
@ -1297,11 +1297,11 @@ sub cascade {
if (not exists $components{$section} and not exists $flatfile{$section}); if (not exists $components{$section} and not exists $flatfile{$section});
$omitdebsrc{$section}=$section if ((defined $keys{$section}{'omitdebsrc'}) $omitdebsrc{$section}=$section if ((defined $keys{$section}{'omitdebsrc'})
and ($keys{$section}{'omitdebsrc'} eq "true")); and ($keys{$section}{'omitdebsrc'} eq "true"));
push @reinstall, split (/ /, lc($keys{$section}{'reinstall'})) push @reinstall, split (/ /, $keys{$section}{'reinstall'})
if (defined $keys{$section}{'reinstall'}); if (defined $keys{$section}{'reinstall'});
$components{$section}='main' if (not defined $components{$section}); $components{$section}='main' if (not defined $components{$section});
$keyrings{$section}=$keys{$section}{'keyring'} if (not exists $keyrings{$section}); $keyrings{$section}=$keys{$section}{'keyring'} if (not exists $keyrings{$section});
push @extrapkgs, split (' ', lc($keys{$section}{'additional'})) push @extrapkgs, split (' ', $keys{$section}{'additional'})
if (defined $keys{$section}{'additional'}); if (defined $keys{$section}{'additional'});
} }
} }