[SCM] ci-tooling packaging branch, master, updated. 7b90074061bfa5d7af160620555ff1a238ae9982

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 7b90074061bfa5d7af160620555ff1a238ae9982
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 12 10:32:35 2015 +0200

    resolve type and series codedup in expunge
---
 kci/expunge.rb | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/kci/expunge.rb b/kci/expunge.rb
index e76805c..f615fae 100755
--- a/kci/expunge.rb
+++ b/kci/expunge.rb
@@ -8,10 +8,6 @@ require 'optparse'
 require_relative '../lib/jenkins'
 require_relative '../lib/lp'
 
-# FIXME: codedup
-DISTRIBUTIONS = %w(utopic vivid)
-TYPES = %w(stable unstable)
-
 options = OpenStruct.new
 OptionParser.new do |opts|
   opts.banner = "Usage: #{opts.program_name} [options] PROJECTNAME"
@@ -24,12 +20,12 @@ OptionParser.new do |opts|
     options.keep_merger = true
   end
 
-  opts.on('--type [TYPE]', TYPES, 'Choose type to expunge (or multiple)') do |v|
+  opts.on('--type [TYPE]', KCI.types, 'Choose type to expunge (or multiple)') do |v|
     options.types ||= []
     options.types << v.to_s
   end
 
-  opts.on('--dist [DIST]', DISTRIBUTIONS.map(&:to_sym),
+  opts.on('--dist [DIST]', KCI.series.keys.map(&:to_sym),
           'Choose series to expunge (or multiple)') do |v|
     options.dists ||= []
     options.dists << v.to_s
@@ -42,8 +38,8 @@ options.name = ARGV[0]
 # Defaults
 options.source ||= options.name
 options.keep_merger ||= false
-options.types ||= TYPES
-options.dists ||= DISTRIBUTIONS
+options.types ||= KCI.types
+options.dists ||= KCI.series.keys
 
 log = Logger.new(STDOUT)
 log.level = Logger::DEBUG
@@ -51,7 +47,6 @@ log.progname = $PROGRAM_NAME
 
 ## JENKINS
 
-# FIXME: codedup from update-projects logic
 job_names = []
 options.dists.each do |d|
   options.types.each do |t|
@@ -69,6 +64,7 @@ end
 
 ## PPA
 
+# FIXME: code dupe in numerous tools that want to wipe
 log.info 'PPA'
 statuses = %w(Pending Published Superseded Obsolete)
 Launchpad.authenticate

-- 
ci-tooling packaging