Merge lp:~harlowja/cloud-init/freebsd-cleaning-part-duo into lp:~cloud-init-dev/cloud-init/trunk

[Joshua Harlow]

  Fix logexc usage in freebsd distro

  - There appeared to be a few logexc calls
    that did not pass the logger in, fix those
    locations where this occured.
  - When a group member adding fails, log the
    error and try the next member instead of
    failing adding any more members

[lp:~harlowja/cloud-init/freebsd-cleaning-part-duo]

932. By Joshua Harlow on 2014-01-25

Don't try to create members if group creation fails

=== modified file 'cloudinit/distros/freebsd.py'
--- cloudinit/distros/freebsd.py	2014-01-25 01:28:05 +0000
+++ cloudinit/distros/freebsd.py	2014-01-25 01:40:17 +0000
@@ -108,17 +108,22 @@
             try:
                 util.subp(group_add_cmd)
                 LOG.info("Created new group %s", name)
-            except Exception:
-                util.logexc("Failed to create group %s", name)
+            except Exception as e:
+                util.logexc(LOG, "Failed to create group %s", name)
+                raise e
 
         if len(members) > 0:
             for member in members:
                 if not util.is_user(member):
                     LOG.warn("Unable to add group member '%s' to group '%s'"
-                                     "; user does not exist.", member, name)
+                             "; user does not exist.", member, name)
                     continue
-                util.subp(['pw', 'usermod', '-n', name, '-G', member])
-                LOG.info("Added user '%s' to group '%s'", member, name)
+                try:
+                    util.subp(['pw', 'usermod', '-n', name, '-G', member])
+                    LOG.info("Added user '%s' to group '%s'", member, name)
+                except Exception:
+                    util.logexc(LOG, "Failed to add user '%s' to group '%s'",
+                                member, name)
 
     def add_user(self, name, **kwargs):
         if util.is_user(name):
@@ -230,15 +235,16 @@
         util.write_file(self.login_conf_fn, newconf.getvalue())
 
         try:
-            util.logexc("Running cap_mkdb for %s", locale)
+            LOG.debug("Running cap_mkdb for %s", locale)
             util.subp(['cap_mkdb', self.login_conf_fn])
         except util.ProcessExecutionError:
             # cap_mkdb failed, so restore the backup.
-            util.logexc("Failed to apply locale %s", locale)
+            util.logexc(LOG, "Failed to apply locale %s", locale)
             try:
                 util.copy(self.login_conf_fn_bak, self.login_conf_fn)
             except IOError:
-                util.logexc("Failed to restore %s backup", self.login_conf_fn)
+                util.logexc(LOG, "Failed to restore %s backup",
+                            self.login_conf_fn)
 
     def install_packages(self, pkglist):
         return