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

Rohan Garg rohangarg-guest at moszumanska.debian.org
Fri Feb 20 15:53:15 UTC 2015


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

The following commit has been merged in the master branch:
commit 209fcd5cc5fb4e321e9d81edf4dfc9405bb85ea1
Author: Rohan Garg <rohan at kde.org>
Date:   Fri Feb 20 16:51:37 2015 +0100

    Make sure we filter out files that end with _source.changes
---
 dci/build.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dci/build.rb b/dci/build.rb
index 0c341e6..98341e7 100644
--- a/dci/build.rb
+++ b/dci/build.rb
@@ -95,14 +95,10 @@ else
         logger.error('Not all files have been installed!') unless $?.success?
       end
       FileUtils.mkdir_p(RESULT_DIR) unless Dir.exist? RESULT_DIR
-      changes_files = Dir.glob('*changes').select { |changes| !changes.include? 'source' }
+      changes_files = Dir.glob('*changes').select { |changes| changes.end_with? '_source.changes' }
 
       logger.warn('No changes file found!') if changes_files.empty?
 
-      # Additional debug for investigating issue
-      system("ls -la")
-      system("pwd")
-
       changes_files.each do |changes_file|
         logger.info("Copying #{changes_file} ...")
         system("dcmd chmod 666 #{changes_file}")

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list