LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File cloud-init-no-user-lock-if-already-locked.patch of Package cloud-init (Project Cloud:Tools)

Index: cloud-init-17.2/cloudinit/distros/__init__.py
===================================================================
--- cloud-init-17.2.orig/cloudinit/distros/__init__.py
+++ cloud-init-17.2/cloudinit/distros/__init__.py
@@ -551,8 +551,11 @@ class Distro(object):
             # 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)