meld r1318 - trunk/vc

[vincele svn gnome org]

Author: vincele
Date: Fri Apr  3 07:59:31 2009
New Revision: 1318
URL: http://svn.gnome.org/viewvc/meld?rev=1318&view=rev

Log:
Search for .cvsignore in ${HOME}


Modified:
   trunk/vc/cvs.py

Modified: trunk/vc/cvs.py
==============================================================================
--- trunk/vc/cvs.py	(original)
+++ trunk/vc/cvs.py	Fri Apr  3 07:59:31 2009
@@ -140,8 +140,8 @@
         cvsfiles = map(lambda x: x[1], matches)
         # ignored
         try:
-            ignored = open( os.path.join(directory, "%s/.cvsignore" % os.environ["HOME"] )).read().split()
-        except (IOError,KeyError):
+            ignored = open(os.path.join(os.environ["HOME"], ".cvsignore")).read().split()
+        except (IOError, KeyError):
             ignored = []
         try:
             ignored += open( os.path.join(directory, ".cvsignore")).read().split()