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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit bd58ca392c9cda440af9f724029db64768a6b28d
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Jan 12 14:51:47 2016 +0100

    make sure to not fail if lsb-release is not present (as is on new debians)
---
 lib/ci/build_binary.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/ci/build_binary.rb b/lib/ci/build_binary.rb
index 5ed02ec..032a7f4 100644
--- a/lib/ci/build_binary.rb
+++ b/lib/ci/build_binary.rb
@@ -39,7 +39,7 @@ module CI
       ]
       # Automatically decide how many concurrent build jobs we can support.
       # NOTE: special cased for trusty master servers to pass
-      dpkg_buildopts << '-jauto' unless LSB::DISTRIB_CODENAME == 'trusty'
+      dpkg_buildopts << '-jauto' unless pretty_old_system?
 
       if DPKG::BUILD_ARCH == 'amd64'
         # On arch:all only build the binaries, the source is already built.
@@ -91,5 +91,13 @@ module CI
       copy_binaries
       print_contents
     end
+
+    private
+
+    def pretty_old_system?
+      LSB::DISTRIB_CODENAME == 'trusty'
+    rescue
+      false
+    end
   end
 end

-- 
ci-tooling packaging