[Blends-commit] [SCM] blends-dev branch, master, updated. f8a439ba10dc09f855fe1b9e32d9dfa4ff507b43

[Andreas Tille]

The following commit has been merged in the master branch:
commit f8a439ba10dc09f855fe1b9e32d9dfa4ff507b43
Author: Andreas Tille <tille at debian.org>
Date:   Tue Nov 4 07:37:43 2014 +0100

    Prevent respecting users sources.list.d dir

diff --git a/debian/changelog b/debian/changelog
index 196aebb..b99f986 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+blends (0.6.92.2) UNRELEASED; urgency=medium
+
+  * devtools/blend-gen-control: Prevent respecting users sources.list.d dir
+
+ -- Andreas Tille <tille at debian.org>  Mon, 03 Nov 2014 11:28:06 +0100
+
 blends (0.6.92.1) unstable; urgency=medium
 
   * Fix typo: s/Section: metapackage/&s/
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 46a61e5..e52a7d3 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -119,7 +119,14 @@ sub apt {
     my $op = shift;
 
     my $aptdir  = "../tmp/apt";
+    # FIXME: For propper apt configuration see
+    #        https://lists.debian.org/debian-mentors/2014/11/msg00032.html
+    #        https://lists.debian.org/debian-mentors/2014/11/msg00033.html
+    # For the moment to do only minimal changes in freeze time we set
+    #        Dir::Etc::sourceparts=none
+    # to prevent including random sources from users sources.list.d
     my @aptopts = ("Dir::Etc::sourcelist=$aptsources",
+                   "Dir::Etc::sourceparts=none",
                    "Dir::State=$aptdir/state",
                    "Dir::Cache=$aptdir/cache",
                    "Dir::State::Status=/dev/null",

-- 
Git repository for blends code