pld-ftp-admin: scripts/move.py - don't die on lack of FTPADM

[arekm]

Author: arekm                        Date: Fri Sep  3 21:07:43 2010 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
- don't die on lack of FTPADM

---- Files affected:
pld-ftp-admin/scripts:
   move.py (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: pld-ftp-admin/scripts/move.py
diff -u pld-ftp-admin/scripts/move.py:1.20 pld-ftp-admin/scripts/move.py:1.21
--- pld-ftp-admin/scripts/move.py:1.20	Fri Sep  3 11:43:24 2010
+++ pld-ftp-admin/scripts/move.py	Fri Sep  3 23:07:38 2010
@@ -87,6 +87,11 @@
             requesters.append(pkg.build[bid].requester)
     pkgs[pkg.nvr] = requesters
 
+ftpadmin = "(unknown)"
+try:
+    ftpadmin = os.environ['FTPADM']
+except KeyError, e:
+    pass
 m = Message()
 m.set_headers(
         to = logs_list,
@@ -98,7 +103,7 @@
         'FTP admin %(ftpadmin)s moved from *%(srctree)s* to *%(dsttree)s* %(count)d packages\n\n' +
         '---- Package name ---- Package built by:\n\n'
     ) % {
-        'ftpadmin' : os.environ['FTPADM'],
+        'ftpadmin' : ftpadmin,
         'srctree' : sys.argv[1],
         'dsttree' : sys.argv[2],
         'count' : len(pkgs),
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/scripts/move.py?r1=1.20&r2=1.21&f=u