valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for #4514

Browse Source 
Cleaning up warning/error messages for issue #4514.  There are now
log messages when either aptsources.sourceslist or
softwareproperties.ppa fail to import.  There are also clearer
log warnings when trying to use functions from either.
This commit is contained in:
Morgan Fainberg 2013-04-19 16:18:15 -07:00
parent ac3083e907
commit cde0c2765d
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
salt/modules/apt.py
View File

@ -12,19 +12,25 @@ import json
# Import salt libs
import salt.utils
log = logging.getLogger(__name__)
try:
from aptsources import sourceslist
apt_support = True
except ImportError:
except ImportError, e:
apt_support = False
err_str = 'Unable to import "sourceslist" from "aptsources" module: {0}'
log.error(err_str.format(str(e)))
try:
import softwareproperties.ppa
ppa_format_support = True
except ImportError:
except ImportError, e:
ppa_format_support = False
log = logging.getLogger(__name__)
err_str = 'Unable to import "softwareproperties.ppa": {0}'
log.warning(err_str.format(str(e)))
# Source format for urllib fallback on PPA handling
LP_SRC_FORMAT = 'deb http://ppa.launchpad.net/{0}/{1}/ubuntu {2} main'
@ -774,8 +780,9 @@ def del_repo(repo, refresh=False, **kwargs):
is_ppa = True
dist = __grains__['lsb_codename']
if not ppa_format_support:
warning_str = 'python-software-properties package not ' \
'installed, making best guess at ppa format: {0}'
warning_str = 'Unable to use functions from ' \
'"python-software-properties" package, making ' \
'best guess at ppa format: {0}'
log.warning(warning_str.format(repo))
owner_name, ppa_name = repo[4:].split('/')
if 'ppa_auth' in kwargs:
@ -898,8 +905,9 @@ def mod_repo(repo, refresh=False, **kwargs):
return {repo: out}
else:
if not ppa_format_support:
log.warning('software-python-properties not installed, '
'falling back to using urllib method for PPA.')
log.warning('Unable to use functions from '
'"python-software-properties" package, making '
'best guess at ppa format: {0}')
else:
log.info('falling back to urllib method for private PPA ')
#fall back to urllib style