Merge branch '1.0-polish' into 'master'

1.0 polish

Closes #424

See merge request fdroid/fdroidserver!405

diff --git a/completion/bash-completion b/completion/bash-completion
index 3627ae460fd48c74bae1ca1b283c689013fcf281..28588656ed5178d3449b220ed93ef2a5cf76c161 100644 (file)
--- a/completion/bash-completion
+++ b/completion/bash-completion
@@ -35,7 +35,7 @@ __by_ext() {
 }
 
 __package() {
-       files="$(__by_ext txt) $(__by_ext yml) $(__by_ext json) $(__by_ext xml)"
+       files="$(__by_ext txt) $(__by_ext yml) $(__by_ext json)"
        COMPREPLY=( $( compgen -W "$files" -- $cur ) )
 }
 

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index d83342d50e3b72a0ebaefa5f6dff9cf0be120401..e2866fbd37c946a6ff5349fff4ebbad6239e1b59 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -414,6 +414,11 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
                 raise BuildException("Error running sudo command for %s:%s" %
                                      (app.id, build.versionName), p.output)
 
+        p = FDroidPopen(['sudo', 'apt-get', '-y', 'purge', 'sudo'])
+        if p.returncode != 0:
+            raise BuildException("Error removing sudo for %s:%s" %
+                                 (app.id, build.versionName), p.output)
+
         log_path = os.path.join(log_dir,
                                 common.get_toolsversion_logname(app, build))
         with open(log_path, 'w') as f:

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index d2bae63feff270216120ee1d7bfc89989fcec2d6..c066d499ce7d68b30ee0cf1e13264aea40e32e26 100644 (file)
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -748,6 +748,8 @@ def read_metadata(xref=True, check_vcs=[], sort_by_time=False):
         metadatafiles = sorted(metadatafiles)
 
     for metadatapath in metadatafiles:
+        if metadatapath == '.fdroid.txt':
+            warn_or_exception(_('.fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json.'))
         packageName, _ignored = fdroidserver.common.get_extension(os.path.basename(metadatapath))
         if packageName in apps:
             warn_or_exception(_("Found multiple metadata files for {appid}")

diff --git a/makebuildserver b/makebuildserver
index 306c2845777ebc13a873e2fc500c50ca95262fed..f2faa09c1f8f2f39e3030e600ec5c77a3e39131b 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -561,7 +561,7 @@ def main():
                                         '-o PasswordAuthentication=no'))
                 # TODO vagrant 1.5+ provides `vagrant rsync`
                 run_via_vagrant_ssh(v, ['cd ~ && test -d', d, '|| mkdir -p', d])
-                subprocess.call(['rsync', '-axv', '--progress', '--delete', '-e',
+                subprocess.call(['rsync', '-ax', '--delete', '-e',
                                  ssh_command,
                                  fullpath + '/',
                                  user + '@' + hostname + ':~/' + d + '/'])