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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 5c4d3806354dbbee3c289f7a3fde788b9e4d90ff
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Oct 15 12:14:45 2015 +0200

    deprecated get_tar and rename it to make rubocop happy
---
 lib/ci/orig_source_builder.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/ci/orig_source_builder.rb b/lib/ci/orig_source_builder.rb
index 00cb4fb..5f68214 100644
--- a/lib/ci/orig_source_builder.rb
+++ b/lib/ci/orig_source_builder.rb
@@ -3,9 +3,12 @@ require 'fileutils'
 require_relative '../debian/changelog'
 require_relative 'build_version'
 require_relative 'source'
+require_relative 'tar_fetcher'
 
 module CI
   class OrigSourceBuilder
+    extend Gem::Deprecate
+
     def initialize
       # @name
       # @version
@@ -23,15 +26,12 @@ module CI
     end
 
     # FIXME: why would the builder need to know how to get the source?
-    def get_tar
-      Dir.chdir(@packagingdir) do
-        system('uscan',
-               '--report-status',
-               '--force-download',
-               '--download-current-version',
-               "--destdir=#{@builddir}")
-      end
+    def retrieve_tar
+      fetcher = WatchTarFetcher.new("#{@packagingdir}/debian/watch")
+      fetcher.fetch(@builddir)
     end
+    deprecate :retrieve_tar, WatchTarFetcher, 2015, 11
+    alias_method :get_tar, :retrieve_tar
 
     # FIXME: this needs to happen magically somehow?
     def sourcepath

-- 
ci-tooling packaging