cloud-init/cloud-init-no-user-lock-if-already-locked.patch

--- cloud-init-0.7.5/cloudinit/distros/__init__.py.orig	2014-09-16 11:00:52.192149797 +0200
+++ cloud-init-0.7.5/cloudinit/distros/__init__.py	2014-09-16 11:02:02.272874250 +0200
@@ -402,8 +402,11 @@
             # about long names.
             util.subp(['passwd', '-l', name])
         except Exception as e:
-            util.logexc(LOG, 'Failed to disable password for user %s', name)
-            raise e
+            if e.exit_code != 3:
+                util.logexc(LOG, 'Failed to disable password for user %s', name)
+                raise e
+            else:
+                util.logexc(LOG, 'Password access already locked for user %s', name)
 
     def set_passwd(self, user, passwd, hashed=False):
         pass_string = '%s:%s' % (user, passwd)
- users-groups module checks if the account is locked by calling 'passwd -l' which is ok but it should not raise if the account is already locked. This patch will cause lock_passwd to raise only if the account locking failed OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=25 2014-09-17 09:17:45 +02:00			`--- cloud-init-0.7.5/cloudinit/distros/__init__.py.orig 2014-09-16 11:00:52.192149797 +0200`
			`+++ cloud-init-0.7.5/cloudinit/distros/__init__.py 2014-09-16 11:02:02.272874250 +0200`
			`@@ -402,8 +402,11 @@`
			`# about long names.`
			`util.subp(['passwd', '-l', name])`
			`except Exception as e:`
			`- util.logexc(LOG, 'Failed to disable password for user %s', name)`
			`- raise e`
			`+ if e.exit_code != 3:`
			`+ util.logexc(LOG, 'Failed to disable password for user %s', name)`
			`+ raise e`
			`+ else:`
			`+ util.logexc(LOG, 'Password access already locked for user %s', name)`

			`def set_passwd(self, user, passwd, hashed=False):`
			`pass_string = '%s:%s' % (user, passwd)`