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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit c84315c494287cdbc1ee73263ddbd8e3ff6299ce
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Oct 5 15:09:01 2015 +0200

    fix ppa search and replace -.-
---
 kci/builder.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index b80af93..800d489 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -66,7 +66,7 @@ class KCIBuilder
                           components.fetch(1),
                           components.fetch(2))
 
-    @ppa = "@ppa:kubuntu-ci/#{project.stability}"
+    @ppa = "ppa:kubuntu-ci/#{project.stability}"
 
     # PWD
     abort 'Could not change dir to ARGV1' unless Dir.chdir(ARGV.fetch(1))
@@ -221,8 +221,8 @@ class KCIBuilder
       # ignore the package and move on.
       `cp -rf /var/lib/jenkins/.ssh /root/`
       `chown -Rv root:root /root/.ssh`
-      if `ssh-keygen -F @ppa.launchpad.net`.strip.empty?
-        `ssh-keyscan -H @ppa.launchpad.net >> ~/.ssh/known_hosts`
+      if `ssh-keygen -F ppa.launchpad.net`.strip.empty?
+        `ssh-keyscan -H ppa.launchpad.net >> ~/.ssh/known_hosts`
       end
       dput = "dput -d -c #{DPUTCONF} #{@ppa} ../#{changelog.name}_#{changelog.version(Changelog::BASE | Changelog::BASESUFFIX)}*.changes"
       success = false
@@ -243,7 +243,7 @@ class KCIBuilder
         puts "after require; before new"
         publisher = SourcePublisher.new(changelog.name, changelog.version, project.stability)
         puts "after new"
-        abort '@ppa Build Failed' unless publisher.wait
+        abort 'PPA Build Failed' unless publisher.wait
         # Write upload data to file, we perhaps want to do something outside the
         # build container.
         data = { name: changelog.name,
@@ -270,7 +270,7 @@ class KCIBuilder
       end
     end
 
-    archindep = File.read('archindep').strip rescue 'amd64' # Get archindep from @ppa script.
+    archindep = File.read('archindep').strip rescue 'amd64' # Get archindep from PPA script.
     log_data = File.open("logs/#{archindep}.log").read
 
     updated_symbols = false
@@ -296,8 +296,8 @@ class KCIBuilder
               updated_symbols = ($? == 0)
               puts_info("Auto-updated symbols of #{lib_package}")
             end
-            # Username et al a at pparently is somehow coming from .git or something
-            # a at pparently
+            # Username et al apparently is somehow coming from .git or something
+            # apparently
             system('git status')
             system('git diff')
             system('git commit -a -m "Automatic symbol update"')
@@ -356,7 +356,7 @@ class KCIBuilder
       require_relative 'lib/qml_dependency_verifier'
 
       dep_verify = QMLDependencyVerifier.new
-      dep_verify.add_ at ppa
+      dep_verify.add_ppa
       missing_modules = dep_verify.missing_modules
       missing_modules.each do |package, modules|
         puts_warning "#{package} has missing dependencies..."

-- 
ci-tooling packaging