mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 07:52:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some more slight logging improvements

Browse source
This commit is contained in:
Daniel Martí 2014-07-03 00:43:03 +02:00
parent a67d80a011
commit 1d6b2378db
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
fdroidserver/common.py
View file

@ -173,9 +173,9 @@ def read_config(opts, config_file='config.py'):
def test_sdk_exists(c): def test_sdk_exists(c):
if c['sdk_path'] is None: if c['sdk_path'] is None:
# c['sdk_path'] is set to the value of ANDROID_HOME by default # c['sdk_path'] is set to the value of ANDROID_HOME by default
logging.critical('No Android SDK found! ANDROID_HOME is not set and sdk_path is not in config.py!') logging.error('No Android SDK found! ANDROID_HOME is not set and sdk_path is not in config.py!')
logging.info('You can use ANDROID_HOME to set the path to your SDK, i.e.:') logging.error('You can use ANDROID_HOME to set the path to your SDK, i.e.:')
logging.info('\texport ANDROID_HOME=/opt/android-sdk') logging.error('\texport ANDROID_HOME=/opt/android-sdk')
return False return False
if not os.path.exists(c['sdk_path']): if not os.path.exists(c['sdk_path']):
logging.critical('Android SDK path "' + c['sdk_path'] + '" does not exist!') logging.critical('Android SDK path "' + c['sdk_path'] + '" does not exist!')
@ -392,11 +392,12 @@ class vcs:
else: else:
deleterepo = True deleterepo = True
logging.info( logging.info(
"Repository details for {0} changed - deleting" "Repository details for %s changed - deleting" % (
.format(self.local)) self.local))
else: else:
deleterepo = True deleterepo = True
logging.info("Repository details missing - deleting") logging.info("Repository details for %s missing - deleting" % (
self.local))
if deleterepo: if deleterepo:
shutil.rmtree(self.local) shutil.rmtree(self.local)
@ -866,7 +867,7 @@ def get_library_references(root_dir):
relpath = os.path.join(root_dir, path) relpath = os.path.join(root_dir, path)
if not os.path.isdir(relpath): if not os.path.isdir(relpath):
continue continue
logging.info("Found subproject at %s" % path) logging.debug("Found subproject at %s" % path)
libraries.append(path) libraries.append(path)
return libraries return libraries
@ -884,7 +885,7 @@ def ant_subprojects(root_dir):
def remove_debuggable_flags(root_dir): def remove_debuggable_flags(root_dir):
# Remove forced debuggable flags # Remove forced debuggable flags
logging.info("Removing debuggable flags") logging.info("Removing debuggable flags from %s" % root_dir)
for root, dirs, files in os.walk(root_dir): for root, dirs, files in os.walk(root_dir):
if 'AndroidManifest.xml' in files: if 'AndroidManifest.xml' in files:
path = os.path.join(root, 'AndroidManifest.xml') path = os.path.join(root, 'AndroidManifest.xml')