[SCM] ci-tooling packaging branch, master, updated. 2419f671a1d77f30f67d04ababf29df7afd8cb5e

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 2419f671a1d77f30f67d04ababf29df7afd8cb5e
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Apr 17 10:16:38 2015 +0200

    revise ppa copy
    
    remove modemmanager override, it's now in stable. change order around
    and add manual copy_sources array containing libs that aren't frameworks
    but need to be copied all the same
---
 kci/ppa-copy-package.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/kci/ppa-copy-package.rb b/kci/ppa-copy-package.rb
index 2df46cf..a58e09b 100755
--- a/kci/ppa-copy-package.rb
+++ b/kci/ppa-copy-package.rb
@@ -22,18 +22,20 @@ require 'ostruct'
 
 require_relative 'lib/lp'
 
-if ENV['COMPONENT'] != 'frameworks'
-  puts 'Not doing a package copy because the component is not "frameworks"'
-  exit
-end
+component = ENV['COMPONENT']
+type = ENV['TYPE']
+name = ENV['NAME']
 
-if ENV['TYPE'] != 'unstable'
+# Only unstable -> stable
+if type != 'unstable'
   puts 'Not doing a package copy because the component is not "unstable"'
   exit
 end
 
-if ENV['NAME'] == 'modemmanager-qt'
-  puts 'Not doing a package copy because modemmanager has a stable version!'
+copy_sources = %w(qca-qt5 qapt debconf-kde)
+if !copy_sources.include?(name) && component != 'frameworks'
+  puts 'Not doing a package copy because the component is not "frameworks"' \
+       " nor is the name whitelisted #{copy_sources}"
   exit
 end
 

-- 
ci-tooling packaging