X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=e5c1ae38eafa6f10875b5667dc02147f3ceeab54;hb=0b086a5406ec0ccae9c660050af7c9f343cf89e6;hp=fd0c53bc842d797bf6a84a9e318ed3b3de37b697;hpb=ce24a42e2c97dc6c463805413ff67f70463d0812;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index fd0c53b..e5c1ae3 100755
--- a/ud-generate
+++ b/ud-generate
@@ -6,7 +6,7 @@
 #   Copyright (c) 2003-2004  James Troup <troup@debian.org>
 #   Copyright (c) 2004-2005,7  Joey Schulze <joey@infodrom.org>
 #   Copyright (c) 2001-2007  Ryan Murray <rmurray@debian.org>
-#   Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
+#   Copyright (c) 2008,2009,2010 Peter Palfrader <peter@palfrader.org>
 #   Copyright (c) 2008 Andreas Barth <aba@not.so.argh.org>
 #   Copyright (c) 2008 Mark Hymers <mhy@debian.org>
 #   Copyright (c) 2008 Luk Claes <luk@debian.org>
@@ -343,6 +343,8 @@ def GenSSHShadow():
       # Oops, something unspeakable happened.
       except IOError:
          Die(File, F, None)
+         # As neither masterFileName nor masterFile are defined at any point
+         # this will raise a NameError.
          Die(masterFileName, masterFile, None)
          raise
 
@@ -401,7 +403,7 @@ def GenSSHtarballs(userlist, SSHFiles, grouprevmap, target):
          lines.append(line)
       if not lines:
          continue # no keys for this host
-      contents = "\n".join(lines)
+      contents = "\n".join(lines) + "\n"
       to.size = len(contents)
       tf.addfile(to, StringIO(contents))