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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit c1388da6b812158ea595705e8fb983b0a7b8d965
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Apr 30 10:22:33 2015 +0200

    autoremove after install
    
    this potentially improves performance a bit over autoremove after purge.
    effectively this means
    * install A -> autoinstalls B -> autoinstalls C
    * test
    * purge A
    * install Z -> autoinstalls Y -> also wants B (already installed)
    * autoremove -> autoremoves C (no longer wanted by anything)
    such that in the end we *might* save some install overhead. This is however
    entirely luck dependent. If the packages are being installed in an
    unsuitable order it will be just as inefficient as purge-autoremove
---
 lib/qml_dependency_verifier.rb                           |  2 +-
 .../test_missing_modules/system_sequence                 | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/qml_dependency_verifier.rb b/lib/qml_dependency_verifier.rb
index b2b0dc2..866fb7c 100644
--- a/lib/qml_dependency_verifier.rb
+++ b/lib/qml_dependency_verifier.rb
@@ -76,6 +76,7 @@ class QMLDependencyVerifier
       @log.info "Checking #{package}: #{version}"
       # FIXME: need to fail otherwise, the results will be skewed
       Apt.install("#{package}=#{version}")
+      Apt::Get.autoremove(args: '--purge')
 
       ignores = []
       ignore_file = "packaging/debian/#{package}.qml-ignore"
@@ -117,7 +118,6 @@ class QMLDependencyVerifier
 
       # FIXME: need to fail otherwise, the results will be skewed
       Apt.purge(package)
-      Apt::Get.autoremove(args: '--purge')
     end
     @log.info 'Done looking for missing modules'
     @log.info missing_modules
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 dd06da6..8b91527 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","-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","autoremove"],
+["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","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","autoremove"],
+["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","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","autoremove"],
+["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","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","autoremove"],
+["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","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","autoremove"],
+["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","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","autoremove"],
+["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","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","--purge","autoremove"],
 ["dpkg -s plasma-framework 2>&1 > /dev/null"],
-["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","autoremove"]
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","purge","plasma-widgets-addons"]
 ]

-- 
ci-tooling packaging