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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit aad1b560d7c96df515d517d1de9011a63ec567d2
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Dec 7 09:58:41 2015 +0100

    resolve numerous style violations with qml_dependency_verifier
---
 lib/qml_dependency_verifier.rb | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/lib/qml_dependency_verifier.rb b/lib/qml_dependency_verifier.rb
index a767ee5..d0ff8d0 100644
--- a/lib/qml_dependency_verifier.rb
+++ b/lib/qml_dependency_verifier.rb
@@ -25,11 +25,15 @@ class QMLDependencyVerifier
   def binaries
     ## Build binary package list from source defintion
     # FIXME: lots of logic dup from install_check
+    ppa_base = '~kubuntu-ci/+archive/ubuntu'
     series = Launchpad::Rubber.from_path("ubuntu/#{LSB::DISTRIB_CODENAME}")
-    host_arch = Launchpad::Rubber.from_url("#{series.self_link}/#{DPKG::HOST_ARCH}")
-    ppa = Launchpad::Rubber.from_path("~kubuntu-ci/+archive/ubuntu/#{source.type}")
+    series = series.self_link
+    host_arch = Launchpad::Rubber.from_url("#{series}/#{DPKG::HOST_ARCH}")
+    ppa = Launchpad::Rubber.from_path("#{ppa_base}/#{source.type}")
 
-    sources = ppa.getPublishedSources(status: 'Published', source_name: source.name, version: source.version)
+    sources = ppa.getPublishedSources(status: 'Published',
+                                      source_name: source.name,
+                                      version: source.version)
     fail 'more than one source package match on launchpad' if sources.size > 1
     fail 'no source package match on launchpad' if sources.size < 1
     source = sources[0]
@@ -68,14 +72,16 @@ class QMLDependencyVerifier
     ## - Look for all .qml files in the package
     ## - Parse each line and extract module information
     ## - For each module check if it is available
-    ##   - Modules can be static mapped in which case we verify its static package
-    ##     is installed
-    ##   - If it is not in the static map we do a path based lookup for the module.
-    ##     This is limited to a list of hardcoded possible search paths
-    ##   The entire thing pretty much disregards version requiements at this time
-    ## - Purge the package and purge the now autoremovable sources. This should lead
-    ##   to an almost prestine environment again for the next package. Ideally we'd
-    ##   spin up a new container but that appears a bit of a waste of time.
+    ##   - Modules can be static mapped in which case we verify its static
+    ##     package is installed
+    ##   - If it is not in the static map we do a path based lookup for the
+    ##     module. This is limited to a list of hardcoded possible search paths
+    ##   The entire thing pretty much disregards version requiements at this
+    ##   time
+    ## - Purge the package and purge the now autoremovable sources. This should
+    ##   lead to an almost prestine environment again for the next package.
+    ##   Ideally we'd spin up a new container but that appears a bit of a waste
+    ##   of time.
     static_map = QML::StaticMap.new
     missing_modules = {}
     binaries.each do |package, version|
@@ -105,7 +111,8 @@ class QMLDependencyVerifier
         static_package = static_map.package(mod)
         if static_package
           # FIXME: move to dpkg module
-          # FIXME: instead of calling -s this probably should manually check /var/lib/dpkg/info as -s is rather slow
+          # FIXME: instead of calling -s this probably should manually check
+          #   /var/lib/dpkg/info as -s is rather slow
           if static_package == 'fake-global-ignore'
             found = true
           else

-- 
ci-tooling packaging