chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c2963c9
)
Don't clean the main ant project twice
author
Daniel Martí
<mvdan@mvdan.cc>
Thu, 13 Feb 2014 08:19:26 +0000
(09:19 +0100)
committer
Daniel Martí
<mvdan@mvdan.cc>
Thu, 13 Feb 2014 08:19:26 +0000
(09:19 +0100)
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index 15dc9ed6f9b7106cac501ed82aa367231afb7b39..0338a4027bb280008b90cfcf1593703c08f6f90f 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-1085,11
+1085,9
@@
def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
if p.returncode != 0 or p.stdout.startswith("Error: "):
raise BuildException("Failed to update project at %s" % d, p.stdout)
# Clean update dirs via ant
- if d == '.':
- logging.info("Cleaning main project")
- else:
+ if d != '.':
logging.info("Cleaning subproject %s" % d)
- p = FDroidPopen(['ant', 'clean'], cwd=subdir)
+
p = FDroidPopen(['ant', 'clean'], cwd=subdir)
return (root_dir, srclibpaths)