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

Stop creating /etc/dpkg/dpkg.cfg.d/multiarch (closes: #819103)

Browse source
This commit is contained in:
Johannes Schauer 2016-12-03 18:04:41 +01:00 committed by Johannes 'josch' Schauer
parent 2d1a5dc6fa
commit 67c12d18e3
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -13,6 +13,7 @@ multistrap (2.2.2) UNRELEASED; urgency=medium
* Allow uppercase letters in paths (closes: #751896) * Allow uppercase letters in paths (closes: #751896)
* Allow shell special characters (including spaces) in paths (closes: * Allow shell special characters (including spaces) in paths (closes:
#803365) #803365)
* Stop creating /etc/dpkg/dpkg.cfg.d/multiarch (closes: #819103)
-- 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

@ -202,22 +202,12 @@ if (not -d "${dir}dev") {
mkdir_fatal ("${dir}dev"); mkdir_fatal ("${dir}dev");
} }
if (($olddpkg == 0) and (scalar (@foreignarches) > 0)) { if (($olddpkg == 0) and (scalar (@foreignarches) > 0)) {
if (not -d "${dir}etc/dpkg/dpkg.cfg.d/") { open (VMA, ">${dir}${dpkgdir}arch");
system_fatal ("mkdir -p " . shellescape("${dir}etc/dpkg/dpkg.cfg.d/")); print VMA "$host\n";
} foreach my $farch (@foreignarches) {
if (not -f "${dir}etc/dpkg/dpkg.cfg.d/multiarch") { print VMA "$farch\n";
open (MA, ">${dir}etc/dpkg/dpkg.cfg.d/multiarch");
foreach my $farch (@foreignarches) {
print MA "foreign-architecture $farch\n";
}
close (MA);
open (VMA, ">${dir}${dpkgdir}arch");
print VMA "$host\n";
foreach my $farch (@foreignarches) {
print VMA "$farch\n";
}
close (VMA);
} }
close (VMA);
} }
&guard_lib64($dir); &guard_lib64($dir);