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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 857460778d4209769dc066451cef9af5eb7e8c7d
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Jun 10 13:40:10 2015 -0700

    make dpkg compatible with older versions of dpkg-architecture
---
 lib/dpkg.rb                                                           | 2 +-
 .../test_missing_modules/backtick_sequence                            | 2 +-
 test/test_dpkg.rb                                                     | 4 ++--
 test/test_qml_dependency_verifier.rb                                  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/dpkg.rb b/lib/dpkg.rb
index 485d33f..a3e6b24 100644
--- a/lib/dpkg.rb
+++ b/lib/dpkg.rb
@@ -14,7 +14,7 @@ module DPKG
   end
 
   def self.architecture(var)
-    run('dpkg-architecture', [] << '--query' << var)[0]
+    run('dpkg-architecture', [] << "-q#{var}")[0]
   end
 
   public
diff --git a/test/data/test_qml_dependency_verifier/test_missing_modules/backtick_sequence b/test/data/test_qml_dependency_verifier/test_missing_modules/backtick_sequence
index 16ca730..d6d20ef 100644
--- a/test/data/test_qml_dependency_verifier/test_missing_modules/backtick_sequence
+++ b/test/data/test_qml_dependency_verifier/test_missing_modules/backtick_sequence
@@ -1,5 +1,5 @@
 [
-["dpkg-architecture --query DEB_HOST_ARCH"],
+["dpkg-architecture -qDEB_HOST_ARCH"],
 ["dpkg -L kwin-addons"],
 ["dpkg -L plasma-dataengines-addons"],
 ["dpkg -L plasma-runners-addons"],
diff --git a/test/test_dpkg.rb b/test/test_dpkg.rb
index 43db6e3..c847243 100644
--- a/test/test_dpkg.rb
+++ b/test/test_dpkg.rb
@@ -7,11 +7,11 @@ class DPKGTest < TestCase
   prepend AssertBacktick
 
   def test_architectures
-    assert_backtick('dpkg-architecture --query DEB_BUILD_ARCH') do
+    assert_backtick('dpkg-architecture -qDEB_BUILD_ARCH') do
       DPKG::BUILD_ARCH
     end
 
-    assert_backtick('dpkg-architecture --query DEB_BUBU') do
+    assert_backtick('dpkg-architecture -qDEB_BUBU') do
       DPKG::BUBU
     end
   end
diff --git a/test/test_qml_dependency_verifier.rb b/test/test_qml_dependency_verifier.rb
index 3366307..3904c2a 100644
--- a/test/test_qml_dependency_verifier.rb
+++ b/test/test_qml_dependency_verifier.rb
@@ -60,7 +60,7 @@ class QMLDependencyVerifierTest < TestCase
   end
 
   def test_binaries
-    assert_backtick(['dpkg-architecture --query DEB_HOST_ARCH']) do
+    assert_backtick(['dpkg-architecture -qDEB_HOST_ARCH']) do
       assert_equal(ref, QMLDependencyVerifier.new.binaries)
     end
   end
@@ -101,7 +101,7 @@ class QMLDependencyVerifierTest < TestCase
 
   def backtick_intercept(args)
     case args[0]
-    when 'dpkg-architecture --query DEB_HOST_ARCH'
+    when 'dpkg-architecture -qDEB_HOST_ARCH'
       return 'amd64'
     when 'dpkg -L plasma-widgets-addons'
       return data('main.qml')

-- 
ci-tooling packaging