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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 0bcbdf15cd3a2668fc55b65f6676a9c3332b8b55
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Nov 3 21:57:52 2015 +0100

    Instead of figuring out the DSC by hand, glob it out of the dir
---
 lib/ci/build_source.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/ci/build_source.rb b/lib/ci/build_source.rb
index 1ea95c0..1929432 100644
--- a/lib/ci/build_source.rb
+++ b/lib/ci/build_source.rb
@@ -31,11 +31,8 @@ module CI
       @source.build_version = CI::BuildVersion.new(changelog)
       if @source.type == :quilt
         @source.version = @source.build_version.full
-        # FIXME: This is just ewwwww
-        @source.dsc = "#{@source.name}_#{@source.build_version.tar}-0.dsc"
       else
         @source.version = @source.build_version.base
-        @source.dsc = "#{@source.name}_#{@source.build_version.tar}.dsc"
       end
 
       @tar_version = @source.build_version.tar
@@ -93,7 +90,13 @@ module CI
       Dir.chdir("#{BUILD_DIR}/source/") do
         system('update-maintainer')
         # Force -sa as reprepreo refuses to accept uploads without orig.
-        return if system('dpkg-buildpackage', '-us', '-uc', '-S', '-d', '-sa')
+        if system('dpkg-buildpackage', '-us', '-uc', '-S', '-d', '-sa')
+          dsc = Dir.glob("*.dsc")
+          fail "More than one dsc!" if dsc.size > 1
+
+          @source.dsc = dsc[0]
+          return
+        end
         fail 'Could not run dpkg-buildpackage!'
       end
     end

-- 
ci-tooling packaging