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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 7833afe7cad00a9e8411a9564a2121966838b364
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Aug 27 08:08:54 2015 +0200

    support linux-any arch when twiddling the dsc
    
    its used in bluedevil
---
 lib/debian/dsc_arch_twiddle.rb                                       | 2 +-
 .../{test_any_all => test_linux_any}/my.dsc                          | 4 ++--
 test/test_debian_dsc_arch_twiddle.rb                                 | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/debian/dsc_arch_twiddle.rb b/lib/debian/dsc_arch_twiddle.rb
index 5bcc075..8b3a499 100644
--- a/lib/debian/dsc_arch_twiddle.rb
+++ b/lib/debian/dsc_arch_twiddle.rb
@@ -55,7 +55,7 @@ module Debian
         next line unless match
         arches = match[1].split(' ')
         arches.collect! do |arch|
-          next enabled_arches if arch == 'any'
+          next enabled_arches if arch == 'any' || arch == 'linux-any'
           next arch if arch == 'all'
           next nil unless enabled_arches.include?(arch)
           arch
diff --git a/test/data/test_debian_dsc_arch_twiddle/test_any_all/my.dsc b/test/data/test_debian_dsc_arch_twiddle/test_linux_any/my.dsc
similarity index 88%
copy from test/data/test_debian_dsc_arch_twiddle/test_any_all/my.dsc
copy to test/data/test_debian_dsc_arch_twiddle/test_linux_any/my.dsc
index 5074910..13d51b5 100644
--- a/test/data/test_debian_dsc_arch_twiddle/test_any_all/my.dsc
+++ b/test/data/test_debian_dsc_arch_twiddle/test_linux_any/my.dsc
@@ -1,13 +1,13 @@
 Format: 3.0 (native)
 Source: dsc-arch
 Binary: dsc-arch
-Architecture: any all
+Architecture: linux-any
 Version: 1ubuntu1
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 9)
 Package-List:
- dsc-arch deb kde optional arch=any
+ dsc-arch deb kde optional arch=linux-any
 Checksums-Sha1:
  b4404e68dd17c01b1785207ed7b658ccceab525e 732 dsc-arch_1ubuntu1.tar.xz
 Checksums-Sha256:
diff --git a/test/test_debian_dsc_arch_twiddle.rb b/test/test_debian_dsc_arch_twiddle.rb
index 1fa018f..46b9449 100644
--- a/test/test_debian_dsc_arch_twiddle.rb
+++ b/test/test_debian_dsc_arch_twiddle.rb
@@ -41,6 +41,11 @@ module Debian
       assert_twiddles("Architecture: amd64 i386 armhf
", env: %w(armhf))
     end
 
+    def test_linux_any
+      assert_twiddles("Architecture: amd64 i386
")
+      assert_twiddles("Architecture: amd64 i386 armhf
", env: %w(armhf))
+    end
+
     def test_any_all
       assert_twiddles("Architecture: amd64 i386 all
")
       assert_twiddles("Architecture: amd64 i386 armhf all
", env: %w(armhf))

-- 
ci-tooling packaging