From: William King <william.king@quentustech.com>
Date: Fri, 9 Oct 2015 16:09:28 +0000 (-0700)
Subject: FS-8271 If using system apt repo list, then include the supplementary ones too.
X-Git-Tag: v1.6.3~1^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbddff88a613e96aa20e08b11413b5375ce7d150;p=thirdparty%2Ffreeswitch.git

FS-8271 If using system apt repo list, then include the supplementary ones too.
---

diff --git a/debian/util.sh b/debian/util.sh
index ca76cb698a..fd37c33f71 100755
--- a/debian/util.sh
+++ b/debian/util.sh
@@ -289,6 +289,14 @@ build_debs () {
       esac
     done
     shift $(($OPTIND-1))
+    if [ "$custom_sources_file" == "/etc/apt/sources.list" ]; then
+        # If you are using the system sources, then it is reasonable that you expect to use all of the supplementary repos too
+        cat /etc/apt/sources.list > /tmp/fs.sources.list
+        for X in /etc/apt/sources.list.d/*; do cat $X >> /tmp/fs.sources.list; done
+        custom_sources_file="/tmp/fs.sources.list"
+        apt-key exportall > "/tmp/fs.asc"
+        custom_keyring="/tmp/fs.asc"
+    fi
     if [ "$custom_sources_file" == "" ]; then
         # Caller has explicitly set the custom sources file to empty string. They must intend to not use additional mirrors.
         use_custom_sources=false