snapcraft.yaml fixery

scripts/make-language-lists

@@ -8,10 +8,17 @@ import sys
 
 DATA_PATH = '/usr/share/localechooser/languagelist.data.gz'
 
+lang_dir = 'po'
+if len(sys.argv) > 1:
+    lang_dir = sys.argv[1]
+
 translations = set()
-for fname in glob.glob('po/*.po'):
+for fname in glob.glob('{}/*.po'.format(lang_dir)):
     translations.add(os.path.splitext(os.path.basename(fname))[0])
 
+if not translations:
+    print("found no languages", file=sys.stderr)
+    sys.exit(1)
 
 langs = [
     ('console', 'en_US', 'English'),
@@ -55,9 +62,8 @@ for code in translations:
         native = native_lang.gettext(name).capitalize()
         langs.append(('ssh', code, native))
     else:
-        print('do not know native name for {}'.format(code))
+        print('do not know native name for {}'.format(code), file=sys.stderr)
         sys.exit(1)
 
-with open('languagelist', 'w') as langlist:
-    for level, code, name in langs:
-        langlist.write("{}:{}:{}\n".format(level, code, name))
+for level, code, name in langs:
+    sys.stdout.write("{}:{}:{}\n".format(level, code, name))

snapcraft.yaml

@@ -129,10 +129,9 @@ parts:
     build-packages:
       - localechooser-data
     override-build: |
-      scripts/make-language-lists
+      $SNAPCRAFT_PROJECT_DIR/scripts/make-language-lists $SNAPCRAFT_PROJECT_DIR/po > $SNAPCRAFT_PART_INSTALL/languagelist
     stage:
-      - languagelist-console
-      - languagelist-ssh
+      - languagelist
   probert:
     plugin: python
     build-packages: [python-setuptools, libnl-3-dev, libnl-genl-3-dev, libnl-route-3-dev]