Don't need legacy disabled build handling everywhere now

This commit is contained in:
Ciaran Gultnieks 2013-10-27 14:40:02 +00:00
parent 075551b715
commit ccdea798fc
4 changed files with 5 additions and 5 deletions

View file

@ -475,7 +475,7 @@ def parse_metadata(metafile, verbose=False):
if parts[2].startswith('!'):
# For backwards compatibility, handle old-style disabling,
# including attempting to extract the commit from the message
thisbuild['disabled'] = parts[2]
thisbuild['disable'] = parts[2]
commit = 'unknown - see disabled'
index = parts[2].rfind('at ')
if index != -1:
@ -757,7 +757,7 @@ def write_metadata(dest, app, verbose=False):
# This defines the preferred order for the build items - as in the
# manual, they're roughly in order of application.
keyorder = ['disabled', 'commit', 'subdir', 'submodules', 'init',
keyorder = ['disable', 'commit', 'subdir', 'submodules', 'init',
'oldsdkloc', 'target', 'compilesdk', 'update',
'encoding', 'forceversion', 'forcevercode', 'rm',
'fixtrans', 'fixapos', 'extlibs', 'srclibs',