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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 8a97c0b50c2ff63a730cd250b4e50a9bdca1b4e9
Author: Harald Sitter <sitter at kde.org>
Date:   Wed May 6 07:25:00 2015 +0200

    qml: add a new maps-to-nothing static map for org.kde.kcm
    
    org.kde.kcm is injected by the KCM harness into the qmlcontext, so there
    is indeed no package that provides it. this isn't exactly unique but what
    makes it unique is the fact that there are bound to be more than one such
    kcm.
    i.e. whereas most injected scopes (short of plasma) are actually private
    to the application org.kde.kcm is injected and public but maps to nothing.
    
    this global ignore prevents us from having to ignore this for each
    package with a qml kcm.
---
 data/qml-static-map.yml                                             | 5 +++++
 lib/qml_dependency_verifier.rb                                      | 6 +++++-
 .../data/test_qml_dependency_verifier/test_missing_modules/main.qml | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/data/qml-static-map.yml b/data/qml-static-map.yml
index 440371a..203e8ad 100644
--- a/data/qml-static-map.yml
+++ b/data/qml-static-map.yml
@@ -6,3 +6,8 @@ kwin:
       version: 2.0
 plasma-workspace:
   - org.kde.plasma.shell
+
+# Not a real package. Represents an override that maps to nothing but is
+# injected at runtime in more than one package
+fake-global-ignore:
+  - org.kde.kcm
diff --git a/lib/qml_dependency_verifier.rb b/lib/qml_dependency_verifier.rb
index 6e3a9a3..a767ee5 100644
--- a/lib/qml_dependency_verifier.rb
+++ b/lib/qml_dependency_verifier.rb
@@ -106,7 +106,11 @@ class QMLDependencyVerifier
         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
-          found = system("dpkg -s #{static_package} 2>&1 > /dev/null")
+          if static_package == 'fake-global-ignore'
+            found = true
+          else
+            found = system("dpkg -s #{static_package} 2>&1 > /dev/null")
+          end
         else
           # FIXME: beyond path this currently doesn't take version into account
           QML::SEARCH_PATHS.each do |search_path|
diff --git a/test/data/test_qml_dependency_verifier/test_missing_modules/main.qml b/test/data/test_qml_dependency_verifier/test_missing_modules/main.qml
index ed210b8..f5bc3cb 100644
--- a/test/data/test_qml_dependency_verifier/test_missing_modules/main.qml
+++ b/test/data/test_qml_dependency_verifier/test_missing_modules/main.qml
@@ -24,6 +24,7 @@ import QtQuick.Controls 1.1
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.plasma.plasmoid 2.0 as Plasmoid
+import org.kde.kcm 1.0
 
 ColumnLayout {
     RowLayout{

-- 
ci-tooling packaging