Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-26 01:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let linux-meta trigger systemd

Browse Source
This commit is contained in:
Martin Pitt 2015-10-29 22:21:13 +01:00
parent 02c4e76c64
commit 1a4a37cb02
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autopkgtest.py
View File

@ -234,10 +234,10 @@ class AutoPackageTest(object):
tests.append((rdep_src, rdep_src_info[VERSION])) tests.append((rdep_src, rdep_src_info[VERSION]))
reported_pkgs.add(rdep_src) reported_pkgs.add(rdep_src)
# Hardcode linux-meta → linux, lxc, glibc triggers until we get a more flexible # Hardcode linux-meta → linux, lxc, glibc, systemd triggers until we get a more flexible
# implementation: https://bugs.debian.org/779559 # implementation: https://bugs.debian.org/779559
if src.startswith('linux-meta'): if src.startswith('linux-meta'):
for pkg in ['lxc', 'glibc', src.replace('linux-meta', 'linux')]: for pkg in ['lxc', 'glibc', src.replace('linux-meta', 'linux'), 'systemd']:
if pkg not in reported_pkgs: if pkg not in reported_pkgs:
# does this have any image on this arch? # does this have any image on this arch?
for b in srcinfo[BINARIES]: for b in srcinfo[BINARIES]:

3
tests/test_autopkgtest.py
View File

@ -1436,6 +1436,8 @@ fancy 1 i386 linux-meta-lts-grumpy 1
testsuite='autopkgtest') testsuite='autopkgtest')
self.data.add('lxc', False, {'Testsuite-Triggers': 'linux-generic'}, self.data.add('lxc', False, {'Testsuite-Triggers': 'linux-generic'},
testsuite='autopkgtest') testsuite='autopkgtest')
self.data.add('systemd', False, {'Testsuite-Triggers': 'linux-generic'},
testsuite='autopkgtest')
self.data.add('linux-image-1', False, {'Source': 'linux'}, testsuite='autopkgtest') self.data.add('linux-image-1', False, {'Source': 'linux'}, testsuite='autopkgtest')
self.data.add('linux-libc-dev', False, {'Source': 'linux'}, testsuite='autopkgtest') self.data.add('linux-libc-dev', False, {'Source': 'linux'}, testsuite='autopkgtest')
self.data.add('linux-image', False, {'Source': 'linux-meta', 'Depends': 'linux-image-1'}) self.data.add('linux-image', False, {'Source': 'linux-meta', 'Depends': 'linux-image-1'})
@ -1449,6 +1451,7 @@ fancy 1 i386 linux-meta-lts-grumpy 1
{'linux-meta': (False, {'lxc 1': {'amd64': 'RUNNING', 'i386': 'RUNNING'}, {'linux-meta': (False, {'lxc 1': {'amd64': 'RUNNING', 'i386': 'RUNNING'},
'glibc 1': {'amd64': 'RUNNING', 'i386': 'RUNNING'}, 'glibc 1': {'amd64': 'RUNNING', 'i386': 'RUNNING'},
'linux 2': {'amd64': 'RUNNING', 'i386': 'RUNNING'}, 'linux 2': {'amd64': 'RUNNING', 'i386': 'RUNNING'},
'systemd 1': {'amd64': 'RUNNING', 'i386': 'RUNNING'},
}), }),
'linux-meta-64only': (False, {'lxc 1': {'amd64': 'RUNNING'}}), 'linux-meta-64only': (False, {'lxc 1': {'amd64': 'RUNNING'}}),
'linux': (False, {}), 'linux': (False, {}),