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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit e4fab5092a1175a89c2f3e2a0b031fc39374d6a7
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Dec 3 11:15:28 2015 +0100

    fully remove the old _scm and replace it with the new SCM version
    
    _scm_scm is now deprecated again and being soft transitioned to _scm again
---
 lib/projects.rb | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/projects.rb b/lib/projects.rb
index f850a52..343a29f 100644
--- a/lib/projects.rb
+++ b/lib/projects.rb
@@ -37,14 +37,12 @@ class Project
 
   # Bool whether this project uses autopkgtest
   attr_reader :autopkgtest
-  # String of the SCM uri
-  def packaging_scm
-    @packaging_scm_scm.url
-  end
-  # FIXME: deprecate, then bring back _scm_scm as _scm and deprecate _scm_scm
-  deprecate :packaging_scm, :packaging_scm_scm, 2015, 12
-  # Packaging SCM SCM instance
-  attr_reader :packaging_scm_scm
+
+  # Packaging SCM instance
+  attr_reader :packaging_scm
+  # TODO: drop _scm_scm
+  alias_method :packaging_scm_scm, :packaging_scm
+  deprecate :packaging_scm_scm, :packaging_scm, 2016, 01
 
   DEFAULT_URL = 'git.debian.org:/git/pkg-kde'
   @default_url = DEFAULT_URL
@@ -78,15 +76,15 @@ class Project
     @series_branches = []
     @autopkgtest = false
     # Clean up path to remove useless slashes and colons.
-    @packaging_scm = Project.cleanup_uri("#{url_base}/#{component}/#{name}")
-    @packaging_scm_scm = CI::SCM.new('git', @packaging_scm, branch)
+    packaging_scm_url = Project.cleanup_uri("#{url_base}/#{component}/#{name}")
+    @packaging_scm = CI::SCM.new('git', packaging_scm_url, branch)
 
     # FIXME: git dir needs to be set somewhere, somehow, somewhat, lol, kittens?
     FileUtils.mkdir_p("git/#{component}") unless Dir.exist?("git/#{component}")
     Dir.chdir("git/#{component}") do
       unless File.exist?(name)
         5.times do
-          break if system("git clone #{@packaging_scm}")
+          break if system("git clone #{@packaging_scm.url}")
         end
       end
       Dir.chdir(name) do
@@ -125,7 +123,7 @@ class Project
         end
 
         unless Debian::Source.new(Dir.pwd).format.type == :native
-          @upstream_scm = CI::UpstreamSCM.new(@packaging_scm, branch)
+          @upstream_scm = CI::UpstreamSCM.new(@packaging_scm.url, branch)
         end
 
         # FIXME: Probably should be converted to a symbol at a later point

-- 
ci-tooling packaging