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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 06ae291ee24bca16a837707499857405d6577e1b
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Jan 12 11:56:03 2016 +0100

    dry repo setup
---
 nci/builder.rb        | 17 ++---------------
 nci/lib/setup_repo.rb | 21 +++++++++++++++++++++
 nci/sourcer.rb        | 17 ++---------------
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/nci/builder.rb b/nci/builder.rb
index 5c599d7..f4ec98a 100755
--- a/nci/builder.rb
+++ b/nci/builder.rb
@@ -1,20 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'open-uri'
+require_relative 'lib/setup_repo'
 
-require_relative '../lib/apt'
-require_relative '../lib/lsb'
-
-debline = "deb http://archive.neon.kde.org.uk/unstable #{LSB::DISTRIB_CODENAME} main"
-Apt::Repository.add(debline)
-# FIXME: this needs to be in the module!
-IO.popen(['apt-key', 'add', '-'], 'w') do |io|
-  io.puts open('http://archive.neon.kde.org.uk/public.key').read
-  io.close_write
-  puts io
-end
-abort 'Failed to import key' unless $? == 0
-Apt.update
-Apt.install(%w(pkg-kde-tools pbuilder)) # Core deps
+NCI.setup_repo!
 
 require_relative '../ci/builder.rb'
diff --git a/nci/lib/setup_repo.rb b/nci/lib/setup_repo.rb
new file mode 100644
index 0000000..e9bd55f
--- /dev/null
+++ b/nci/lib/setup_repo.rb
@@ -0,0 +1,21 @@
+require 'open-uri'
+
+require_relative '../../lib/apt'
+require_relative '../../lib/lsb'
+
+module NCI
+  module_function
+
+  def setup_repo!
+    debline = "deb http://archive.neon.kde.org.uk/unstable #{LSB::DISTRIB_CODENAME} main"
+    abort 'adding repo failed' unless Apt::Repository.add(debline)
+    # FIXME: this needs to be in the module!
+    IO.popen(['apt-key', 'add', '-'], 'w') do |io|
+      io.puts open('http://archive.neon.kde.org.uk/public.key').read
+      io.close_write
+      puts io
+    end
+    abort 'Failed to import key' unless $? == 0
+    abort 'apt updated failed' unless Apt.update
+  end
+end
diff --git a/nci/sourcer.rb b/nci/sourcer.rb
index 212a724..7318904 100755
--- a/nci/sourcer.rb
+++ b/nci/sourcer.rb
@@ -1,20 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'open-uri'
+require_relative 'lib/setup_repo'
 
-require_relative '../lib/apt'
-require_relative '../lib/lsb'
-
-debline = "deb http://archive.neon.kde.org.uk/unstable #{LSB::DISTRIB_CODENAME} main"
-Apt::Repository.add(debline)
-# FIXME: this needs to be in the module!
-IO.popen(['apt-key', 'add', '-'], 'w') do |io|
-  io.puts open('http://archive.neon.kde.org.uk/public.key').read
-  io.close_write
-  puts io
-end
-abort 'Failed to import key' unless $? == 0
-Apt.update
-Apt.install(%w(dh-autoreconf dh-acc pkg-kde-tools germinate dh-translations pbuilder))
+NCI.setup_repo!
 
 require_relative '../ci/sourcer.rb'

-- 
ci-tooling packaging