Fix several small bugs

Author: mherrmann

fbs/_gpg.py

@@ -32,14 +32,22 @@ def _get_keygrip(pubkey_id):
         if 'invalid option "--with-keygrip"' in e.stderr:
             raise GpgDoesNotSupportKeygrip() from None
         raise
-    lines = output.split('\n')
+    pure_signing_subkey = _find_keygrip(output, 'S')
+    if pure_signing_subkey:
+        return pure_signing_subkey
+    any_signing_key = _find_keygrip(output, '[^]]*S[^]]*')
+    if any_signing_key:
+        return any_signing_key
+    raise RuntimeError('Keygrip not found. Output was:\n' + output)
+
+def _find_keygrip(gpg2_output, type_re):
+    lines = gpg2_output.split('\n')
     for i, line in enumerate(lines):
-        if re.match(r'.*\[[^]]*S[^]]*\]$', line):
+        if re.match(r'.*\[%s\]$' % type_re, line):
             for keygrip_line in lines[i + 1:]:
                 m = re.match(r' +Keygrip = ([A-Z0-9]{40})', keygrip_line)
                 if m:
                     return m.group(1)
-    raise RuntimeError('Keygrip not found. Output was:\n' + output)
 
 class GpgDoesNotSupportKeygrip(RuntimeError):
     pass

fbs/sign_installer/arch.py

@@ -14,7 +14,7 @@ def sign_installer_arch():
     # Prevent GPG from prompting us for the passphrase when signing:
     preset_gpg_passphrase()
     check_call(
-        ['gpg', '--batch', '--yes', '-u', '0x%s!' % SETTINGS['gpg_key'],
+        ['gpg', '--batch', '--yes', '-u', SETTINGS['gpg_key'],
         '--output', installer + '.sig', '--detach-sig', installer],
         stdout=DEVNULL
     )

setup.py

@@ -32,7 +32,8 @@ def _get_package_data(pkg_dir, data_subdir):
     url='https://build-system.fman.io',
     packages=find_packages(exclude=('tests', 'tests.*')),
     package_data={
-        'fbs._defaults': _get_package_data('fbs/_defaults', 'src'),
+        'fbs._defaults': _get_package_data('fbs/_defaults', 'requirements') +
+                         _get_package_data('fbs/_defaults', 'src'),
         'fbs.builtin_commands':
             _get_package_data('fbs/builtin_commands', 'project_template'),
         'fbs.builtin_commands._gpg':