Bug#685924: support other uses cases in apt preferences handling
Package: live-build
Version: 3.0~a67-1
Followup-For: Bug #685924
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Hi again,
After to review the comments I suppose that you are right about your
point, by other side like i said, this patch originated from a bug, so
this is a new proposed patch for the "real" bug
* first part: a simple typo in the "deconfigure actions"
* like you can see in the patch and the comment of my old report, is a wrong check (wants to act to the .orig file but it checks it exist another one)
Old report extract:
> I have a .pref file in config/chroot_apt/ , in the deconfigure step it exit with an error about "mv dir/file.pref.orig not found"...
- -- Package-specific info:
- -- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-3-686-pae (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages live-build depends on:
ii debootstrap 1.0.42
Versions of packages live-build recommends:
ii cpio 2.11-8
ii gnu-fdisk 1.2.4-3.1
ii live-boot-doc 3.0~a35-1
ii live-config-doc 3.0.12-1
ii live-manual-html [live-manual] 1:3.0~a13-1
Versions of packages live-build suggests:
ii dosfstools 3.0.13-1
ii fakeroot 1.18.4-2
ii genisoimage 9:1.1.11-2
ii git 1:1.7.10.4-1
pn loadlin <none>
ii memtest86+ 4.20-1.1
ii mtools 4.0.17-1
ii parted 2.3-11
ii squashfs-tools 1:4.2-5
ii sudo 1.8.5p2-1
pn syslinux | grub <none>
ii uuid-runtime 2.20.1-5.2
pn win32-loader <none>
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBCAAGBQJQqkM7AAoJEKLHmb/f+NfCZSwQALmR5AZ10dYk+NuA4mWCqjP3
Hz3yDHUiZ7FclkBh5WkPeEDN84WQWK+lTVAjfF949o1HEu8wunwpMTf7nTFjs3D2
2JIwlLrKmJjIXxlh2PXtHJTgM2eDjG5635svbflV26G9fQMzlt3a28mzGp76dtJe
jgIP3VVQ6QYjJy2DCAYPPB5RW5fUZgqWSi7uHo47rerUqbvFRirZ9S9U0f3v5Thx
lqp8hTMdIhiRkQL40iH2NMlfjYbANCL657pzrxyEf2CGVdWsyUu2yLelIT57/atK
vPODJxO5dWUluXaTY/8R4+Gq597Gpbh2ECQtP+a4+7U1jBrmjzTbYLiz+djylDLa
vjxI/wCZS8bhpzR+20VAmQ5bWxQqVL6NXqSrHe8pS6o3i674f1P97WSyGFJ5PsNN
5f/gYCz57Pi6ScE28Nmv0J2BQt/dzQSFD9NMHtbiY10rhax0F30v2WRiJKU/Bswn
X3W5R5+UMMv772yk+MXU5AwxgU3HgXDeqaxTwYEQW/HRCI36BsoK/ct8rCMO5SJG
hvbBWSjLwpmYVVPkZoDgC7X57bDF//vTs5GTi955pYrWyzbkwuaJBz9Bp+RfbNCP
IRJjTA5rIYyroQXfgpgNGIEHdsRg0IW5V9kSMz9m8+JSUNEVxFeykmAwY8FL/V9h
DGcLzJ4lfA+jsngcmwzn
=nujM
-----END PGP SIGNATURE-----
--- a/scripts/build/chroot_apt
+++ b/scripts/build/chroot_apt
@@ -255,7 +255,7 @@ EOF
rm -f chroot/etc/apt/apt.conf.d/00secure
fi
- # Configuring apt config
+ # Deconfiguring apt config
if [ -f config/apt/apt.conf ]
then
if [ -f chroot/etc/apt/apt.conf ]
@@ -298,7 +298,7 @@ EOF
cp -aL ${_FILE} chroot/etc/apt/preferences.d
- if [ -f chroot/etc/apt/preferences.d/$(basename ${_FILE}) ]
+ if [ -f chroot/etc/apt/preferences.d/$(basename ${_FILE}).orig ]
then
mv chroot/etc/apt/preferences.d/$(basename ${_FILE}).orig chroot/etc/apt/preferences.d/$(basename ${_FILE})
fi
Reply to: