From 54e14988881e983c401f5b04fd9938d78a7cf90b Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 4 Dec 2015 18:04:57 +0100 Subject: [PATCH] Fix apt 1.1 regression in apt-preferences handling apt >=1.1 fails to parse our apt-preferences setup: | E: Invalid record in the preferences file /etc/apt/preferences, no Package header --- etc/grml/fai/config/files/etc/apt/preferences.d/udev/DEBIAN_WHEEZY | 4 +--- .../config/files/etc/apt/preferences.d/wheezy-backports/DEBIAN_WHEEZY | 4 +--- etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/etc/grml/fai/config/files/etc/apt/preferences.d/udev/DEBIAN_WHEEZY b/etc/grml/fai/config/files/etc/apt/preferences.d/udev/DEBIAN_WHEEZY index 573b723..ea23a14 100644 --- a/etc/grml/fai/config/files/etc/apt/preferences.d/udev/DEBIAN_WHEEZY +++ b/etc/grml/fai/config/files/etc/apt/preferences.d/udev/DEBIAN_WHEEZY @@ -1,6 +1,4 @@ -// This file is installed by grml-live. -// -// Install udev from Wheezy instead of deb.grml.org +Explanation: this file was installed by grml-live to install udev from wheezy instead of deb.grml.org Package: udev Pin: release n=wheezy Pin-Priority: 999 diff --git a/etc/grml/fai/config/files/etc/apt/preferences.d/wheezy-backports/DEBIAN_WHEEZY b/etc/grml/fai/config/files/etc/apt/preferences.d/wheezy-backports/DEBIAN_WHEEZY index 46ab719..f9f789c 100644 --- a/etc/grml/fai/config/files/etc/apt/preferences.d/wheezy-backports/DEBIAN_WHEEZY +++ b/etc/grml/fai/config/files/etc/apt/preferences.d/wheezy-backports/DEBIAN_WHEEZY @@ -1,6 +1,4 @@ -// This file is installed by grml-live. -// -// Allow overriding initramfs-tools from backports +Explanation: this file was installed by grml-live to allow overriding initramfs-tools from backports Package: initramfs-tools Pin: release a=wheezy-backports Pin-Priority: 997 diff --git a/etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE b/etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE index 268c208..2e84214 100644 --- a/etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE +++ b/etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE @@ -1,6 +1,4 @@ -// This file is installed by grml-live. -// -// Allow overriding packages via grml-live repository: +Explanation: this file was installed by grml-live to allow overriding packages via grml-live repository Package: * Pin: release o=The grml project,a=grml-live,l=grml,c=main Pin-Priority: 997 -- 2.1.4