[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/user_group.py

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/06/27 18:04:07

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : user_group.py 

Log message:
        Fix user_group.py to run on native Windows, which lacks grp and pwd 
Python
        modules. (Patch from Fred Gansevles)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.280&r2=1.281
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/user_group.py?cvsroot=rdiff-backup&r1=1.8&r2=1.9

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -b -r1.280 -r1.281
--- CHANGELOG   26 Jun 2008 03:19:13 -0000      1.280
+++ CHANGELOG   27 Jun 2008 18:04:07 -0000      1.281
@@ -1,6 +1,9 @@
 New in v1.1.17 (????/??/??)
 ---------------------------
 
+Fix user_group.py to run on native Windows, which lacks grp and pwd Python
+modules. (Patch from Fred Gansevles)
+
 Optimize --check-destination and other functions by determining the increment
 files server-side instead of client-side. (Patch from Josh Nisly)
 

Index: rdiff_backup/user_group.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/user_group.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- rdiff_backup/user_group.py  25 Oct 2005 02:38:16 -0000      1.8
+++ rdiff_backup/user_group.py  27 Jun 2008 18:04:07 -0000      1.9
@@ -30,7 +30,11 @@
 
 """
 
-import grp, pwd
+try:
+       import grp, pwd
+except ImportError:
+       pass
+
 import log, Globals
 
 ############ "Private" section - don't use outside user_group ###########
@@ -52,7 +56,7 @@
        try: return uname2uid_dict[uname]
        except KeyError:
                try: uid = pwd.getpwnam(uname)[2]
-               except KeyError: uid = None
+               except (KeyError, NameError): uid = None
                uname2uid_dict[uname] = uid
                return uid
 
@@ -62,7 +66,7 @@
        try: return gname2gid_dict[gname]
        except KeyError:
                try: gid = grp.getgrnam(gname)[2]
-               except KeyError: gid = None
+               except (KeyError, NameError): gid = None
                gname2gid_dict[gname] = gid
                return gid
 
@@ -163,7 +167,7 @@
        try: return uid2uname_dict[uid]
        except KeyError:
                try: uname = pwd.getpwuid(uid)[0]
-               except (KeyError, OverflowError), e: uname = None
+               except (KeyError, OverflowError, NameError), e: uname = None
                uid2uname_dict[uid] = uname
                return uname
 
@@ -172,7 +176,7 @@
        try: return gid2gname_dict[gid]
        except KeyError:
                try: gname = grp.getgrgid(gid)[0]
-               except (KeyError, OverflowError), e: gname = None
+               except (KeyError, OverflowError, NameError), e: gname = None
                gid2gname_dict[gid] = gname
                return gname