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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 011f7574ecf7a0d73e31f6297ae58c82f5c62f97
Author: Rohan Garg <rohan at garg.io>
Date:   Fri Apr 24 17:26:41 2015 +0200

    Move deb_from_url into a unless guard
---
 dci/imager.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index 5be5919..368d0ef 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -162,14 +162,16 @@ Dir.chdir('build') do
                package + "
", mode: 'a')
   end
 
-  packages_from_url.each do |package|
-    deb_from_url(package)
-  end
+  unless packages_from_url.empty
+    packages_from_url.each do |package|
+      deb_from_url(package)
+    end
 
-  # Packages MUST follow a certain naming scheme according to the
-  # live-build manual
-  Dir.glob('config/packages.chroot/*.deb').each do |deb|
-    system("dpkg-name #{deb}")
+    # Packages MUST follow a certain naming scheme according to the
+    # live-build manual
+    Dir.glob('config/packages.chroot/*.deb').each do |deb|
+      system("dpkg-name #{deb}")
+    end
   end
 
   File.delete('config/archives/dci.list') if File.exist? 'config/archives/dci.list'

-- 
ci-tooling packaging