Merge branch 'stdin' into 'master'

rewritemeta: fix for metadata from stdin

See merge request fdroid/fdroidserver!1768

fdroidserver/rewritemeta.py

@@ -72,6 +72,7 @@ def main():
 
     if options.stdin:
         app = metadata.parse_yaml_metadata(sys.stdin)
+        app["id"] = "stdin"
         metadata.write_yaml(sys.stdout, app)
         logging.debug(_("Finished"))
         return

tests/test_rewritemeta.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import io
 import os
 import tempfile
 import textwrap
@@ -118,3 +119,13 @@ class RewriteMetaTest(unittest.TestCase):
                     '''
                 ),
             )
+
+    @mock.patch('sys.argv', ['fdroid', 'rewritemeta', '--stdin'])
+    @mock.patch('sys.stdout', new_callable=io.StringIO)
+    @mock.patch('sys.stdin', io.StringIO('UpdateCheckMode: None\nAutoUpdateMode: None'))
+    def test_rewrite_from_stdin(self, stdout):
+        rewritemeta.main()
+
+        self.assertEqual(
+            stdout.getvalue(), '\nAutoUpdateMode: None\nUpdateCheckMode: None\n'
+        )