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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 9863e909e7745e798bd2bd7c0c6f345e9e35f489
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Dec 7 12:05:07 2015 +0100

    style fixes for ppa scripts
---
 kci/ppa-copy-all.rb     | 16 +++++++++-------
 kci/ppa-copy-package.rb |  7 ++++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/kci/ppa-copy-all.rb b/kci/ppa-copy-all.rb
index 1def7c1..79c5097 100755
--- a/kci/ppa-copy-all.rb
+++ b/kci/ppa-copy-all.rb
@@ -30,14 +30,15 @@ distribution = 'utopic'
 fail 'need dist arg' if ARGV.empty?
 # distribution = ARGV[0]
 
-# to_copy = %x[ssh git.debian.org ls /git/pkg-kde/frameworks].chop!.gsub!('.git', '').split(' ')
+# to_copy = %x[ssh git.debian.org ls /git/pkg-kde/frameworks]
+# to_copy.chop!.gsub!('.git', '').split(' ')
 
 Launchpad.authenticate
 # FIXME: current assumptions: source is unstable, target is always stable
-source_ppa = Launchpad::Rubber.from_url("https://api.launchpad.net/devel/~kubuntu-ci/+archive/ubuntu/#{ARGV[0]}")
-target_ppa = Launchpad::Rubber.from_url("https://api.launchpad.net/devel/~kubuntu-ci/+archive/ubuntu/unstable-weekly")
-# target_ppa = Launchpad::Rubber.from_url('https://api.launchpad.net/devel/~netrunner-os/+archive/ubuntu/netrunner-15-ci-52')
-series = Launchpad::Rubber.from_url("https://api.launchpad.net/devel/ubuntu/#{distribution}")
+ppa_base = '~kubuntu-ci/+archive/ubuntu'
+source_ppa = Launchpad::Rubber.from_path("#{ppa_base}/#{ARGV[0]}")
+target_ppa = Launchpad::Rubber.from_path("#{ppa_base}/unstable-weekly")
+series = Launchpad::Rubber.from_path("ubuntu/#{distribution}")
 
 sources = source_ppa.getPublishedSources(status: 'Published',
                                          distro_series: series)
@@ -53,10 +54,11 @@ threads = []
     log.level = Logger::INFO
     log.datetime_format = ''
 
-    while s = source_queue.pop(true) do
+    while (s = source_queue.pop(true))
       begin
         unless target_ppa.getPublishedSources(distro_series: series,
-                                              source_name: s.source_package_name,
+                                              source_name:
+                                                s.source_package_name,
                                               version: s.source_package_version,
                                               exact_match: true).empty?
           log.warn "Skipping #{s.display_name}; already there"
diff --git a/kci/ppa-copy-package.rb b/kci/ppa-copy-package.rb
index 2551b58..0379d9b 100755
--- a/kci/ppa-copy-package.rb
+++ b/kci/ppa-copy-package.rb
@@ -48,9 +48,10 @@ source = JSON.parse(File.read('source.json'), object_class: OpenStruct)
 Launchpad.authenticate
 
 # FIXME: current assumptions: source is unstable, target is always stable
-source_ppa = Launchpad::Rubber.from_url('https://api.launchpad.net/devel/~kubuntu-ci/+archive/ubuntu/unstable')
-target_ppa = Launchpad::Rubber.from_url('https://api.launchpad.net/devel/~kubuntu-ci/+archive/ubuntu/stable')
-series = Launchpad::Rubber.from_url("https://api.launchpad.net/devel/ubuntu/#{distribution}")
+ppa_base = '~kubuntu-ci/+archive/ubuntu'
+source_ppa = Launchpad::Rubber.from_path("#{ppa_base}/unstable")
+target_ppa = Launchpad::Rubber.from_path("#{ppa_base}/stable")
+series = Launchpad::Rubber.from_path("ubuntu/#{distribution}")
 
 source_ppa.getPublishedSources(source_name: source.name,
                                version: source.version,

-- 
ci-tooling packaging