[meld] Validate CVS using local info rather than roundtrip (closes bgo#663128)



commit 2278d1160b4800fa3aff7c7516bfd98543e94732
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Mar 30 06:41:13 2013 +1000

    Validate CVS using local info rather than roundtrip (closes bgo#663128)

 meld/vc/cvs.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/meld/vc/cvs.py b/meld/vc/cvs.py
index 1c5b326..f61b198 100644
--- a/meld/vc/cvs.py
+++ b/meld/vc/cvs.py
@@ -1,4 +1,5 @@
 # Copyright (C) 2002-2005 Stephen Kennedy <stevek gnome org>
+# Copyright (C) 2013 Kai Willadsen <kai willadsen gmail com>
 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -64,10 +65,11 @@ class Vc(_vc.Vc):
         return [self.CMD, "update", "-C"]
 
     def valid_repo(self):
-        if _vc.call([self.CMD, "version"], cwd=self.root):
-            return False
-        else:
+        entry_path = os.path.join(self.root, self.VC_DIR, "Entries")
+        if os.path.exists(entry_path):
             return True
+        else:
+            return False
 
     def _get_dirsandfiles(self, directory, dirs, files):
         log = logging.getLogger(__name__)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]