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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 51e56738066a98128ce65be97cec660338bec4ba
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Feb 25 09:19:30 2015 +0100

    mark all the things +x
---
 kci/all_jobs_built.rb   |  0
 kci/build.rb            |  0
 kci/builder.rb          |  0
 kci/daily-promote.rb    |  0
 kci/expunge.rb          |  0
 kci/install_check.rb    |  0
 kci/ppa-copy-all.rb     |  4 ++--
 kci/ppa-copy-package.rb |  0
 kci/ppa-retry-all.rb    |  0
 kci/ppa-wait.py         |  0
 kci/ppa-wait.rb         |  0
 kci/ppa-wipe.rb         |  0
 kci/qml_dep_verify.rb   |  0
 kci/sign.rb             |  0
 kci/tarbuild.rb         |  0
 lib/lp.rb               | 18 +++++++++++++++++-
 16 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/kci/all_jobs_built.rb b/kci/all_jobs_built.rb
old mode 100644
new mode 100755
diff --git a/kci/build.rb b/kci/build.rb
old mode 100644
new mode 100755
diff --git a/kci/builder.rb b/kci/builder.rb
old mode 100644
new mode 100755
diff --git a/kci/daily-promote.rb b/kci/daily-promote.rb
old mode 100644
new mode 100755
diff --git a/kci/expunge.rb b/kci/expunge.rb
old mode 100644
new mode 100755
diff --git a/kci/install_check.rb b/kci/install_check.rb
old mode 100644
new mode 100755
diff --git a/kci/ppa-copy-all.rb b/kci/ppa-copy-all.rb
old mode 100644
new mode 100755
index 4531350..30c3707
--- a/kci/ppa-copy-all.rb
+++ b/kci/ppa-copy-all.rb
@@ -34,8 +34,8 @@ fail 'need dist arg' if ARGV.empty?
 
 Launchpad.authenticate
 # FIXME: current assumptions: source is unstable, target is always stable
-source_ppa = Launchpad::Rubber.from_url("https://api.launchpad.net/devel/~kubuntu-ppa/+archive/ubuntu/#{ARGV[0]}")
-target_ppa = Launchpad::Rubber.from_url("https://api.launchpad.net/devel/~kubuntu-ppa/+archive/ubuntu/next-backports")
+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}")
 
diff --git a/kci/ppa-copy-package.rb b/kci/ppa-copy-package.rb
old mode 100644
new mode 100755
diff --git a/kci/ppa-retry-all.rb b/kci/ppa-retry-all.rb
old mode 100644
new mode 100755
diff --git a/kci/ppa-wait.py b/kci/ppa-wait.py
old mode 100644
new mode 100755
diff --git a/kci/ppa-wait.rb b/kci/ppa-wait.rb
old mode 100644
new mode 100755
diff --git a/kci/ppa-wipe.rb b/kci/ppa-wipe.rb
old mode 100644
new mode 100755
diff --git a/kci/qml_dep_verify.rb b/kci/qml_dep_verify.rb
old mode 100644
new mode 100755
diff --git a/kci/sign.rb b/kci/sign.rb
old mode 100644
new mode 100755
diff --git a/kci/tarbuild.rb b/kci/tarbuild.rb
old mode 100644
new mode 100755
diff --git a/lib/lp.rb b/lib/lp.rb
index 75927dd..a0bfb10 100644
--- a/lib/lp.rb
+++ b/lib/lp.rb
@@ -25,6 +25,22 @@ require 'thread'
 require 'oauth'
 require 'oauth/signature/plaintext'
 
+# BEGIN {
+#
+#   require 'net/http'
+#
+#   Net::HTTP.module_eval do
+#     alias_method '__initialize__', 'initialize'
+#
+#     def initialize(*args,&block)
+#       __initialize__(*args, &block)
+#     ensure
+#       @debug_output = $stderr ### if ENV['HTTP_DEBUG']
+#     end
+#   end
+#
+# }
+
 # A simple launchpad REST API wrapper.
 module Launchpad
   @mutex = Mutex.new
@@ -49,7 +65,7 @@ module Launchpad
       return nil
     end
 
-    consumer_options.merge(scheme: :header, site: 'https://api.launchpad.net')
+    consumer_options = consumer_options.merge(scheme: :header, site: 'https://api.launchpad.net')
     consumer = OAuth::Consumer.new('kubuntu-ci', '', consumer_options)
     access_token = OAuth::AccessToken.from_hash(consumer, token_hash)
     @token = access_token

-- 
ci-tooling packaging