[SCM] ci-tooling packaging branch, master, updated. 140faea23dfb80980fb6187cad3820833debca1f
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Fri Jan 15 10:12:53 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=aaf4aac
The following commit has been merged in the master branch:
commit aaf4aacd1d6e250290df842d550ddcd74329696e
Author: Harald Sitter <sitter at kde.org>
Date: Fri Jan 15 10:59:16 2016 +0100
when failing on git clones fail a transaction not a runtime. don't hide it
---
lib/projects.rb | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/lib/projects.rb b/lib/projects.rb
index 6312d2b..ef440cd 100644
--- a/lib/projects.rb
+++ b/lib/projects.rb
@@ -118,7 +118,9 @@ class Project
end
end
end
- fail "Could not obtain #{@packaging_scm.url}" unless Dir.exist?(name)
+ unless File.exist?(name)
+ fail GitTransactionError, "Could not clone #{@packaging_scm.url}"
+ end
Dir.chdir(name) do
if component == 'launchpad'
system('bzr pull')
@@ -268,11 +270,12 @@ class ProjectFactory
fail if repos.empty? # Shouldn't be empty here. Must be something wrong
# Create actual Project instances.
repos.each do |repo|
- begin
- ret << Project.new(repo, custom_ci['org'] || '', custom_ci['git_host'],
- type: type)
- rescue Project::Error
- end
+ # FIXME: why the fucking fuck is the component field called org
+ # what the fuck.
+ ret << Project.new(repo,
+ custom_ci['org'] || '',
+ custom_ci['git_host'],
+ type: type)
end
end
when 'static_ci'
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list