[SCM] ci-tooling packaging branch, master, updated. 981ff63e3fd69d313245cd68746138013ef23193

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=981ff63

The following commit has been merged in the master branch:
commit 981ff63e3fd69d313245cd68746138013ef23193
Author: Rohan Garg <rohan at kde.org>
Date:   Mon Jan 12 15:01:50 2015 +0100

    Make sure we open file in RW mode and use the right vars everywhere
---
 dci/imager.rb | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index a936d6d..fc162d1 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -52,9 +52,9 @@ def workarounds
         f.puts('live-boot-initramfs-tools')
     end
 
-    File.open('config/package-lists/desktop.list.chroot', 'w') do |f|
+    File.open('config/package-lists/desktop.list.chroot', 'r+') do |f|
         contents = f.read
-        contents.gsub!(/#nif/, '#if')
+        contents.gsub!(/plymouth-drm/, '')
         contents.gsub!(/task-kde-desktop/, '')
         f.puts(contents)
     end
@@ -75,26 +75,28 @@ Dir.chdir('build') do
             --distribution #{RELEASE} \
             -m #{MIRROR} \
             --debian-installer false \
-            --source false")
+            --source false \
+            --security false \
+            --updates false")
     FileUtils.mkdir_p('config/archives')
     workarounds
     packages = []
     case FLAVOR
     when /.*netrunner.*desktop/
         packages << "debian-plasma5-desktop"
-        repos << 'deb http://pangea-data.s3.amazonaws.com/plasma/debian sid main'
-        repos << 'deb http://pangea-data.s3.amazonaws.com/moz-plasma/debian sid main'
+        repos << "deb http://pangea-data.s3.amazonaws.com/plasma/debian #{RELEASE} main"
+        repos << "deb http://pangea-data.s3.amazonaws.com/moz-plasma/debian #{RELEASE} main"
 
     when /.*netrunner.*cloud/
         packages << "debian-plasma5-cloud"
-        repos << 'deb http://pangea-data.s3.amazonaws.com/plasma/debian sid main'
-        repos << 'deb http://pangea-data.s3.amazonaws.com/moz-plasma/debian sid main'
+        repos << "deb http://pangea-data.s3.amazonaws.com/plasma/debian #{RELEASE} main"
+        repos << "deb http://pangea-data.s3.amazonaws.com/moz-plasma/debian #{RELEASE} main"
 
         File.write('config/archives/owncloud.pref', OWNCLOUD_PREF)
 
     when /.*maui.*/
         # TODO: Implement
-        repos << 'deb http://pangea-data.s3.amazonaws.com/maui-desktop/debian sid main'
+        repos << "deb http://pangea-data.s3.amazonaws.com/maui-desktop/debian #{RELEASE} main"
     else
         logger.error("Don't understand the flavor #{FLAVOR}")
         exit 1

-- 
ci-tooling packaging