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

Harald Sitter apachelogger-guest at moszumanska.debian.org
Wed Apr 29 11:44:52 UTC 2015


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

The following commit has been merged in the master branch:
commit 55ac8fe5050dcfd29dc7284a104dbedd06eb4156
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Apr 29 13:44:48 2015 +0200

    implement per-package ignore rules in qml verifier
---
 lib/qml_dependency_verifier.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/qml_dependency_verifier.rb b/lib/qml_dependency_verifier.rb
index ca5fe20..9a605e3 100644
--- a/lib/qml_dependency_verifier.rb
+++ b/lib/qml_dependency_verifier.rb
@@ -76,6 +76,9 @@ class QMLDependencyVerifier
       # FIXME: need to fail otherwise, the results will be skewed
       Apt.install("#{package}=#{version}")
 
+      ignore_file = "packaging/debian/#{package}.qml-ignore"
+      ignores = IgnoreRule.read(ignore_file) if File.exist?(ignore_file)
+
       files = DPKG.list(package).select { |f| File.extname(f) == '.qml' }
 
       # TODO: THREADING!
@@ -85,7 +88,10 @@ class QMLDependencyVerifier
         lines = File.read(file).lines
         lines.each do |l|
           m = QML::Module.parse(l)
-          modules << m if m
+          if m
+            next if ignores.include?(m)
+            modules << m
+          end
         end
       end
       @log.info "Imported modules: #{modules}"

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list