Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

ubuntutools/misc: convert print() to std logging

Browse Source
This commit is contained in:
Dan Streetman 2020-03-04 08:27:11 +01:00
parent 907061c15e
commit 9f428e471b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ubuntutools/misc.py
View File

@ -57,7 +57,7 @@ def system_distribution_chain():
encoding='utf-8').strip() encoding='utf-8').strip()
_system_distribution_chain.append(vendor) _system_distribution_chain.append(vendor)
except CalledProcessError: except CalledProcessError:
print('Error: Could not determine what distribution you are running.') Logger.error('Could not determine what distribution you are running.')
return [] return []
while True: while True:
@ -97,7 +97,7 @@ def host_architecture():
arch = None arch = None
if not arch or 'not found' in arch: if not arch or 'not found' in arch:
print('Error: Not running on a Debian based system; ' Logger.error('Not running on a Debian based system; '
'could not detect its architecture.') 'could not detect its architecture.')
return None return None
@ -112,14 +112,14 @@ def readlist(filename, uniq=True):
""" """
if not os.path.isfile(filename): if not os.path.isfile(filename):
print('File "%s" does not exist.' % filename) Logger.error('File "%s" does not exist.' % filename)
return False return False
with open(filename) as f: with open(filename) as f:
content = f.read().replace('\n', ' ').replace(',', ' ') content = f.read().replace('\n', ' ').replace(',', ' ')
if not content.strip(): if not content.strip():
print('File "%s" is empty.' % filename) Logger.error('File "%s" is empty.' % filename)
return False return False
items = [item for item in content.split() if item] items = [item for item in content.split() if item]
@ -156,7 +156,7 @@ def split_release_pocket(release, default='Release'):
def require_utf8(): def require_utf8():
'''Can be called by programs that only function in UTF-8 locales''' '''Can be called by programs that only function in UTF-8 locales'''
if locale.getpreferredencoding() != 'UTF-8': if locale.getpreferredencoding() != 'UTF-8':
print("This program only functions in a UTF-8 locale. Aborting.", file=sys.stderr) Logger.error("This program only functions in a UTF-8 locale. Aborting.")
sys.exit(1) sys.exit(1)