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

Fix KeyError crash with NBS binaries in testing

Browse Source 
Traceback (most recent call last):
   File "/var/lib/britney/britney.py", line 3390, in <module>
     Britney().main()
   File "/var/lib/britney/britney.py", line 295, in __init__
     self.merge_binaries('testing', 'unstable', arch)
   File "/var/lib/britney/britney.py", line 785, in merge_binaries
     target_version = target_sources[value[SOURCE]][VERSION]
 KeyError: 'insighttoolkit4'
This commit is contained in:
Martin Pitt 2016-01-27 09:57:55 +01:00
parent 6269ca4813
commit 158d79999f
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
britney.py
View File

@ -781,7 +781,11 @@ class Britney(object):
# that have built on this architecture. # that have built on this architecture.
if value[SOURCE] not in oodsrcs: if value[SOURCE] not in oodsrcs:
source_version = source_sources[value[SOURCE]][VERSION] source_version = source_sources[value[SOURCE]][VERSION]
target_version = target_sources[value[SOURCE]][VERSION] try:
target_version = target_sources[value[SOURCE]][VERSION]
except KeyError:
self.__log("merge_binaries: pkg %s has no source, NBS?" % pkg)
continue
if source_version != target_version: if source_version != target_version:
current_arch = value[ARCHITECTURE] current_arch = value[ARCHITECTURE]
built = False built = False

16
tests/test_autopkgtest.py
View File

@ -1216,6 +1216,22 @@ class T(TestBase):
{'lightgreen': [('old-version', '1'), ('new-version', '2')]} {'lightgreen': [('old-version', '1'), ('new-version', '2')]}
) )
def test_nbs(self):
'''source-less binaries do not cause harm'''
# NBS in testing
self.data.add('liboldgreen0', False, add_src=False)
# NBS in unstable
self.data.add('liboldgreen1', True, add_src=False)
self.do_test(
[('libgreen1', {'Version': '2', 'Source': 'green'}, 'autopkgtest')],
{'green': (True, {'green 2': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'lightgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'darkgreen 1': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
}),
},
{'green': [('old-version', '1'), ('new-version', '2')]})
################################################################ ################################################################
# Tests for hint processing # Tests for hint processing
################################################################ ################################################################