[SCM] ci-tooling packaging branch, master, updated. c23288111b62ed4dda657b0a77bc7a3aaa0c5c90
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Thu Feb 26 13:31:04 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=c232881
The following commit has been merged in the master branch:
commit c23288111b62ed4dda657b0a77bc7a3aaa0c5c90
Author: Harald Sitter <sitter at kde.org>
Date: Thu Feb 26 14:31:00 2015 +0100
next try at fixing the logic
---
kci/install_check.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kci/install_check.rb b/kci/install_check.rb
index e997cfd..1d059f6 100755
--- a/kci/install_check.rb
+++ b/kci/install_check.rb
@@ -143,8 +143,8 @@ class CiPPA
LOG.info "apt-add-repository #{args.join(' ')}"
system('apt-add-repository', *args)
updated = apt(:update)
- LOG.info "#{to_remove} && #{updated} = #{(to_remove && updated)}"
- unless to_remove && updated
+ LOG.info "#{!to_remove} && #{!updated} = #{(!to_remove && !updated)}"
+ if !updated && !to_remove
# Updated failed. Rip the PPA out again.
LOG.error "#{@type} caused an apt update fail, removing it again..."
return software_properties(:remove)
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list