summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-04-10 19:22:47 +0000
committerBaserock Gerrit <gerrit@baserock.org>2016-04-10 19:22:47 +0000
commit757aed14cd1d94bc642124a2538557f7442a2636 (patch)
treea67436c9e1576a3df1e89369c3724fb4c4fc25cd
parent90dbbffbc2c3beb44768a03107516978d3a4da1a (diff)
parent401aad76b852d22fefc896718e6520a52f69a64d (diff)
downloadspec-757aed14cd1d94bc642124a2538557f7442a2636.tar.gz
Merge "migrations: Fix version 6 migration when build system isn't detected"
-rwxr-xr-xmigrations/006-specify-build-system.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/migrations/006-specify-build-system.py b/migrations/006-specify-build-system.py
index b66736c..6ccecff 100755
--- a/migrations/006-specify-build-system.py
+++ b/migrations/006-specify-build-system.py
@@ -324,8 +324,11 @@ def ensure_buildsystem_defined_where_needed(contents, filename):
'%s: got file list %s', chunk_git_url, toplevel_file_list)
build_system = detect_build_system(toplevel_file_list)
- chunk_ref['build-system'] = build_system.name
- move_dict_entry_last(chunk_ref, 'build-depends')
+ if build_system:
+ chunk_ref['build-system'] = build_system.name
+ move_dict_entry_last(chunk_ref, 'build-depends')
+ else:
+ warnings.warn("Couldn't work out the build system of chunk %s" % chunk_ref.get('name'))
changed = True