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

Harald Sitter apachelogger-guest at moszumanska.debian.org
Thu Sep 17 10:44:51 UTC 2015


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

The following commit has been merged in the master branch:
commit 8c477694ab08140319a94eff90f09b63cdbcdca7
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Sep 17 12:44:49 2015 +0200

    add a testing stub for svn overrides
    
    now that we have no repos with source in svn anymore we need a stub to
    test this. still a naughty crutch but better than not testing this
---
 data/upstream-scm.yml     | 6 ++++++
 test/test_upstream_scm.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/data/upstream-scm.yml b/data/upstream-scm.yml
index 93a48cf..219d1fe 100644
--- a/data/upstream-scm.yml
+++ b/data/upstream-scm.yml
@@ -111,3 +111,9 @@ https://github.com/plasma-phone-packaging/plasma-maliit-framework-packaging:
 https://github.com/plasma-phone-packaging/libepoxy:
   kubuntu_unstable:
     url: https://github.com/anholt/libepoxy.git
+
+## FOR TESTING ONLY! - THIS NEEDS TO STAY HERE
+git.debian.org:/git/pkg-kde/yolo/kittens:
+  kubuntu_unstable:
+    type: svn
+    url: svn://anonsvn.kde.org/home/kde/trunk/KDE/plasma-workspace-wallpapers
diff --git a/test/test_upstream_scm.rb b/test/test_upstream_scm.rb
index 8dfdb46..11c654d 100644
--- a/test/test_upstream_scm.rb
+++ b/test/test_upstream_scm.rb
@@ -15,7 +15,7 @@ class UpstreamSCMTest < TestCase
   def test_global_override
     base = 'git.debian.org:/git/pkg-kde'
     workspace = "#{base}/plasma/plasma-workspace"
-    wallpapers = "#{base}/plasma/plasma-workspace-wallpapers"
+    wallpapers = "#{base}/yolo/kittens"
     qt = "#{base}/qt/qtbase"
     scm = UpstreamSCM.new(workspace, 'kubuntu_stable', '/')
     assert_equal('Plasma/5.4', scm.branch)

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list