Python 2.4 fixes for modules
This commit is contained in:
parent
360701ea43
commit
f16ab9169c
2 changed files with 3 additions and 3 deletions
2
mysql_db
2
mysql_db
|
@ -182,7 +182,7 @@ def main():
|
||||||
|
|
||||||
if state in ['dump','import']:
|
if state in ['dump','import']:
|
||||||
if target is None:
|
if target is None:
|
||||||
module.fail_json(msg="with state={0} target is required".format(state))
|
module.fail_json(msg="with state=%s target is required" % (state))
|
||||||
connect_to_db = db
|
connect_to_db = db
|
||||||
else:
|
else:
|
||||||
connect_to_db = 'mysql'
|
connect_to_db = 'mysql'
|
||||||
|
|
4
user
4
user
|
@ -718,7 +718,7 @@ class SunOS(User):
|
||||||
continue
|
continue
|
||||||
fields[1] = self.password
|
fields[1] = self.password
|
||||||
line = ':'.join(fields)
|
line = ':'.join(fields)
|
||||||
lines.append('{0}\n'.format(line))
|
lines.append('%s\n' % line)
|
||||||
open(self.SHADOWFILE, 'w+').writelines(lines)
|
open(self.SHADOWFILE, 'w+').writelines(lines)
|
||||||
except Exception, err:
|
except Exception, err:
|
||||||
self.module.fail_json(msg="failed to update users password: %s" % str(err))
|
self.module.fail_json(msg="failed to update users password: %s" % str(err))
|
||||||
|
@ -800,7 +800,7 @@ class SunOS(User):
|
||||||
continue
|
continue
|
||||||
fields[1] = self.password
|
fields[1] = self.password
|
||||||
line = ':'.join(fields)
|
line = ':'.join(fields)
|
||||||
lines.append('{0}\n'.format(line))
|
lines.append('%s\n' % line)
|
||||||
open(self.SHADOWFILE, 'w+').writelines(lines)
|
open(self.SHADOWFILE, 'w+').writelines(lines)
|
||||||
rc = 0
|
rc = 0
|
||||||
except Exception, err:
|
except Exception, err:
|
||||||
|
|
Loading…
Reference in a new issue