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

Harald Sitter apachelogger-guest at moszumanska.debian.org
Sat Jun 13 16:19:38 UTC 2015


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

The following commit has been merged in the master branch:
commit 3ba763daea65e96cc2d299f00b65fb4d4897bd1a
Author: Harald Sitter <sitter at kde.org>
Date:   Sat Jun 13 09:17:11 2015 -0700

    attempt to fix log retrieval
---
 kci/builder.rb          | 4 ++--
 kci/source_publisher.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index c977b2a..a8509f7 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -275,7 +275,7 @@ Dir.chdir('build/source/') do
   end
 end
 
-unless File.exist?('logs/i386.log.gz')
+unless File.exist?('logs/i386.log')
   puts "found no logs"
   exit 0
 end
@@ -405,7 +405,7 @@ end
 logs = []
 architectures_with_log = []
 Dir.chdir('logs/') do
-  `gunzip *.log.gz`
+  # `gunzip *.log.gz`
   Dir.glob('*.log').each do |log|
     logs << "#{WORKSPACE_PATH}/logs/#{log}"
     architectures_with_log << File.basename(log, '.log')
diff --git a/kci/source_publisher.rb b/kci/source_publisher.rb
index 2ade129..61e53d6 100755
--- a/kci/source_publisher.rb
+++ b/kci/source_publisher.rb
@@ -158,7 +158,7 @@ class SourcePublisher
       begin
         Net::HTTP.start(uri.host) do |http|
           response = http.get(uri.path)
-          File.open("#{log_dir}/#{build.arch_tag}.log.gz", 'w') do |file|
+          File.open("#{log_dir}/#{build.arch_tag}.log", 'w') do |file|
             file.write(response.body)
           end
         end

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list