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

[RFC] Add support for apt_preferences(5) files



Hi!

While libglib2.0-udeb in unstable is currently broken due to a dependency
problem, the version in testing is fine to work with.

So in order to continue to work on other aspects of d-i, I implemented
support for apt_preferences(5) in the build system.  It was fairly easy
and the patch is quite small.  This allow to easily select packages
depending on their source.

What do you think?

---
 installer/build/util/get-packages |    3 +++
 installer/build/util/pkg-list     |    1 +
 installer/debian/changelog        |    4 ++++
 3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/installer/build/util/get-packages b/installer/build/util/get-packages
index b51522d..c8c1637 100755
--- a/installer/build/util/get-packages
+++ b/installer/build/util/get-packages
@@ -8,6 +8,8 @@
 # Files:
 #   sources.list.udeb / sources.list.udeb.local
 #   sources.list.deb  / sources.list.deb.local
+#   preferences.udeb.local
+#   preferences.deb.local
 #
 # Environment:
 #   APTDIR       - basename for the apt directory (default: apt.$TYPE)
@@ -73,6 +75,7 @@ fi
 # everything so it need not run as root.
 APT_GET="apt-get --assume-yes \
 	-o Dir::Etc::sourcelist=`pwd`/$LIST \
+	-o Dir::Etc::Preferences=`pwd`/preferences.$TYPE.local \
 	-o Dir::State=`pwd`/$APTDIR/state \
 	-o Debug::NoLocking=true \
 	-o Dir::Cache=`pwd`/$APTDIR/cache \
diff --git a/installer/build/util/pkg-list b/installer/build/util/pkg-list
index 87ff95c..fe3755c 100755
--- a/installer/build/util/pkg-list
+++ b/installer/build/util/pkg-list
@@ -62,6 +62,7 @@ sub apt_cache {
 	
 	return `LANG=C apt-cache \\
 		-o Dir::Etc::sourcelist=./$sourceslist \\
+		-o Dir::Etc::Preferences=./preferences.udeb.local \\
 		-o Dir::State=./apt.udeb/state \\
 		-o Dir::State::Status=./apt.udeb/state/status \\
 		-o Dir::Cache=./apt.udeb/cache $params 2>/dev/null`;
diff --git a/installer/debian/changelog b/installer/debian/changelog
index 02b0ae1..0d4dabd 100644
--- a/installer/debian/changelog
+++ b/installer/debian/changelog
@@ -134,6 +134,10 @@ debian-installer (2007xxxx) UNRELEASED; urgency=low
 
   [ Joey Hess ]
   * Change f8.txt to document tasksel/desktop.
+  
+  [ Jérémy Bobbio ]
+  * Add support for apt_preferences(5) files (preferences.{deb,udeb}.local) to
+    ease development when packages are broken in unstable.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 14 Sep 2007 10:01:58 -0400
 
Cheers,
-- 
Jérémy Bobbio                        .''`. 
lunar@debian.org                    : :Ⓐ  :  # apt-get install anarchism
                                    `. `'` 
                                      `-   

Attachment: signature.asc
Description: Digital signature


Reply to: