[Checkins] SVN: cipher.googlepam/trunk/ add-google-users does not break if you don't specify --admin-group.

[Marius Gedminas]

Log message for revision 127934:
  add-google-users does not break if you don't specify --admin-group.

Changed:
  U   cipher.googlepam/trunk/CHANGES.txt
  U   cipher.googlepam/trunk/src/cipher/googlepam/addusers.py

-=-
Modified: cipher.googlepam/trunk/CHANGES.txt
===================================================================
--- cipher.googlepam/trunk/CHANGES.txt	2012-10-08 12:20:44 UTC (rev 127933)
+++ cipher.googlepam/trunk/CHANGES.txt	2012-10-08 12:20:51 UTC (rev 127934)
@@ -12,6 +12,8 @@
   domain, username, password and group.  You can also use -C/--config-file to
   specify a different config file.
 
+- add-google-users does not break if you don't specify --admin-group.
+
 - Added Debian packaging.
 
 

Modified: cipher.googlepam/trunk/src/cipher/googlepam/addusers.py
===================================================================
--- cipher.googlepam/trunk/src/cipher/googlepam/addusers.py	2012-10-08 12:20:44 UTC (rev 127933)
+++ cipher.googlepam/trunk/src/cipher/googlepam/addusers.py	2012-10-08 12:20:51 UTC (rev 127934)
@@ -103,12 +103,13 @@
     # 3. Create a new user account for each account.
     for user in users:
         try:
-            do(options.command %user, dry_run=options.dry_run)
+            do(options.command % user, dry_run=options.dry_run)
         except CMDError, err:
             # We do not want to fail, if the user already exists.
             if err.args[0] != 1:
                 raise
-        do(ADDADMIN_CMD %user, dry_run=options.dry_run)
+        if options.admin_group:
+            do(ADDADMIN_CMD % user, dry_run=options.dry_run)
 
 parser.add_option(
     '-C', '--config-file', action='store',