[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#693250: live-build: wrong copy of files from config/archives/repo.pref.chroot



Package: live-build
Version: 3.0~a67-1
Severity: normal
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

If you have preferences in 'config/archives/something.pref.chroot', it
will prompt a build error like:

+ [ -e config/archives/elive_priority.pref.chroot ]
+ basename .chroot
+ cp config/archives/.chroot chroot/etc/apt/preferences.d

The attached patch solves this problem, which seems to be made by a
wrong copy-paste


- -- 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~a43-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)

iQIcBAEBCAAGBQJQo93JAAoJEKLHmb/f+NfCdQkQAKb5W01SFIzW2RIytwJXyANL
kQI2nrRCASSy03IWDu23Rkb1tv/VRZ0/RxraiH0jii8RTqhqJ+G+ovRjjXPvKMeT
r5sVhBNjBMtTu5UI9n29PMLJaCR5qUETNFtbDBTE9f6sfUsQ65Gvi6ucMLhxSnZo
5symOv1YbEVtZkHFnHqGNHttIzWjbwb9LpEGCk2Oo6MCN3mBkxSyBb93F99wfYqq
6DjgIQUSxzEucctwaB5XWwwXS3kgf+x1S9RtJGqZGrDTjgjTt0gDDaZDqOKjqb2b
5gJZmwP5EWnwi3LQi46Y2++8h9yRo+5F4R/IU3QW0kIiJxpvE8lFRshw3ucJaep9
pQeNJhHT3VDJTZIEhvboaPZzQ9M9/dBv+2sfdlR0Q+0lIBKI/uUf5fFgwi7FpqNr
tySG2fvossUTU9o5GltAA/oiwczHAY/mm+xtD66HRbKLiySIDpmnRoWSOLoScgNi
nZis4rnRXq94MbIUDVWpwBQWfXtwopyJag9LxKPfzGXgiPm+Dge2BbpytxDs8oHs
tK9MUdagNSywKD5HkYKttJfDvR8SlqBF156NLmb9tRtSnkrQSyXjem5HJx5i/Tre
x8OAwzG5KjBFeah0AWYUgJI8INzyd6Xqp66jRnAAiDyej0B1Celi37gvnf7XNRGb
RDDzLlL0f8P4P2nTUgeE
=Or0K
-----END PGP SIGNATURE-----
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -290,7 +290,7 @@ EOF
 			do
 				if [ -e "${FILE}" ]
 				then
-					cp config/archives/$(basename ${_FILE} .chroot) chroot/etc/apt/preferences.d
+					cp ${FILE} chroot/etc/apt/preferences.d/$(basename ${FILE} .chroot)
 				fi
 			done
 		fi
@@ -851,7 +851,7 @@ EOF
 			do
 				if [ -e "${FILE}" ]
 				then
-					cp config/archives/$(basename ${_FILE} .binary) chroot/etc/apt/preferences.d
+					cp ${FILE} chroot/etc/apt/preferences.d/$(basename ${FILE} .binary)
 				fi
 			done
 		fi

Reply to: