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:
347ff7b
)
Don't allow --skip-scan if scandelete is set up
author
Daniel Martí
<mvdan@mvdan.cc>
Tue, 6 Jan 2015 13:40:31 +0000
(14:40 +0100)
committer
Daniel Martí
<mvdan@mvdan.cc>
Tue, 6 Jan 2015 13:40:31 +0000
(14:40 +0100)
fdroidserver/build.py
patch
|
blob
|
history
diff --git
a/fdroidserver/build.py
b/fdroidserver/build.py
index b942c28e9dc10db6324dcfaacc61fdd2245b187e..f83ab4302d6579a838b7e7be7716725a65d49e50 100644
(file)
--- a/
fdroidserver/build.py
+++ b/
fdroidserver/build.py
@@
-534,7
+534,10
@@
def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
if 'gradle' in dirs:
shutil.rmtree(os.path.join(root, 'gradle'))
- if not options.skipscan:
+ if options.skipscan:
+ if thisbuild['scandelete']:
+ raise BuildException("Refusing to skip source scan since scandelete is present")
+ else:
# Scan before building...
logging.info("Scanning source for common problems...")
count = common.scan_source(build_dir, root_dir, thisbuild)