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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit fb71dccae8ae3ecba6a37cdbc7ddceff6831dd50
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Apr 9 11:46:50 2015 +0200

    pass apt force-yes as option in the hopes of it not crapping out
    
    we don't want to fall things fall over from force-yes not working
---
 lib/apt.rb                                         |  3 +-
 .../test_missing_modules/system_sequence           | 42 +++++++++++-----------
 test/test_apt.rb                                   |  2 +-
 test/test_qml_dependency_verifier.rb               |  4 +--
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/lib/apt.rb b/lib/apt.rb
index 9a20425..adc1c84 100644
--- a/lib/apt.rb
+++ b/lib/apt.rb
@@ -69,7 +69,8 @@ module Apt
     def self.default_args
       @default_args if defined?(@default_args)
       @default_args = []
-      @default_args << '--force-yes' << '-y'
+      @default_args << '-y'
+      @default_args << '-o' << 'APT::Get::force-yes=true'
       @default_args << '-o' << 'Debug::pkgProblemResolver=true'
       @default_args
     end
diff --git a/test/data/test_qml_dependency_verifier/test_missing_modules/system_sequence b/test/data/test_qml_dependency_verifier/test_missing_modules/system_sequence
index daf0584..d80a724 100644
--- a/test/data/test_qml_dependency_verifier/test_missing_modules/system_sequence
+++ b/test/data/test_qml_dependency_verifier/test_missing_modules/system_sequence
@@ -1,24 +1,24 @@
 [
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","kdeplasma-addons-data=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","kdeplasma-addons-data"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","kwin-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","kwin-addons"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-dataengines-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-dataengines-addons"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-runners-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-runners-addons"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-wallpapers-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-wallpapers-addons"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-widget-kimpanel=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-widget-kimpanel"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","install","plasma-widgets-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","install","kdeplasma-addons-data=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","purge","kdeplasma-addons-data"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","install","kwin-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","purge","kwin-addons"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","install","plasma-dataengines-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","purge","plasma-dataengines-addons"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","install","plasma-runners-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","purge","plasma-runners-addons"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","install","plasma-wallpapers-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","purge","plasma-wallpapers-addons"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","install","plasma-widget-kimpanel=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","purge","plasma-widget-kimpanel"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","--purge","autremove"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","install","plasma-widgets-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
 ["dpkg -s plasma-framework 2>&1 > /dev/null"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","purge","plasma-widgets-addons"],
-["apt-get","--force-yes","-y","-o","Debug::pkgProblemResolver=true","--purge","autremove"]
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","purge","plasma-widgets-addons"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","--purge","autremove"]
 ]
diff --git a/test/test_apt.rb b/test/test_apt.rb
index 83ba0bb..137bbdb 100644
--- a/test/test_apt.rb
+++ b/test/test_apt.rb
@@ -18,7 +18,7 @@ class AptTest < TestCase
   end
 
   def default_args(cmd = 'apt-get')
-    [cmd] + %w(--force-yes -y -o Debug::pkgProblemResolver=true)
+    [cmd] + %w(-y -o APT::Get::force-yes=true -o Debug::pkgProblemResolver=true)
   end
 
   def assert_system_default(args, &block)
diff --git a/test/test_qml_dependency_verifier.rb b/test/test_qml_dependency_verifier.rb
index e95d5f8..d30eb1f 100644
--- a/test/test_qml_dependency_verifier.rb
+++ b/test/test_qml_dependency_verifier.rb
@@ -63,9 +63,9 @@ class QMLDependencyVerifierTest < TestCase
   end
 
   def test_add_ppa
-    assert_system([%w(apt-get --force-yes -y -o Debug::pkgProblemResolver=true install software-properties-common),
+    assert_system([%w(apt-get -y -o APT::Get::force-yes=true -o Debug::pkgProblemResolver=true install software-properties-common),
                    %w(add-apt-repository ppa:kubuntu-ci/unstable),
-                   %w(apt-get --force-yes -y -o Debug::pkgProblemResolver=true update)]) do
+                   %w(apt-get -y -o APT::Get::force-yes=true -o Debug::pkgProblemResolver=true update)]) do
       QMLDependencyVerifier.new.add_ppa
     end
   end

-- 
ci-tooling packaging