diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | multistrap | 20 |
2 files changed, 6 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index 7616250..434a0b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ multistrap (2.2.2) UNRELEASED; urgency=medium * Allow uppercase letters in paths (closes: #751896) * Allow shell special characters (including spaces) in paths (closes: #803365) + * Stop creating /etc/dpkg/dpkg.cfg.d/multiarch (closes: #819103) -- Johannes Schauer <josch@debian.org> Fri, 02 Dec 2016 23:25:07 +0100 @@ -202,22 +202,12 @@ if (not -d "${dir}dev") { mkdir_fatal ("${dir}dev"); } if (($olddpkg == 0) and (scalar (@foreignarches) > 0)) { - if (not -d "${dir}etc/dpkg/dpkg.cfg.d/") { - system_fatal ("mkdir -p " . shellescape("${dir}etc/dpkg/dpkg.cfg.d/")); - } - if (not -f "${dir}etc/dpkg/dpkg.cfg.d/multiarch") { - 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); + open (VMA, ">${dir}${dpkgdir}arch"); + print VMA "$host\n"; + foreach my $farch (@foreignarches) { + print VMA "$farch\n"; } + close (VMA); } &guard_lib64($dir); |