mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-13 17:16:23 +01:00
Code

- minor cosmetic changes

Browse Source
This commit is contained in:
Marcus Huewe 2010-12-18 03:39:19 +01:00
parent 51d2436023
commit b1db52c7b6
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osc/conf.py
View File

@ -772,9 +772,8 @@ def get_config(override_conffile = None,
if not user is None and len(user) == 0: if not user is None and len(user) == 0:
user = None user = None
print >>sys.stderr, "Warning: blank user in the keyring for the "\ print >>sys.stderr, 'Warning: blank user in the keyring for the ' \
"api url %s.\nRun seahorse to fix the "\ 'apiurl %s.\nPlease fix your keyring entry.'
"entry.\n" % (url)
# Read credentials from config # Read credentials from config
if user is None: if user is None:
@ -783,9 +782,8 @@ def get_config(override_conffile = None,
user = cp.get(url, 'user', raw=True) # need to set raw to prevent '%' expansion user = cp.get(url, 'user', raw=True) # need to set raw to prevent '%' expansion
password = cp.get(url, 'pass', raw=True) # especially on password! password = cp.get(url, 'pass', raw=True) # especially on password!
passwordx = cp.get(url, 'passx', raw=True) # especially on password! passwordx = cp.get(url, 'passx', raw=True) # especially on password!
if user is None or len(user) == 0: if user is None or user == '':
raise oscerr.ConfigError("user is blank for %s" % apiurl, raise oscerr.ConfigError('user is blank for %s' % apiurl, config['conffile'])
config['conffile'])
if password is None or password == 'your_password': if password is None or password == 'your_password':
try: try: