From a2ec078f25eb357edd1912ca3dbd578979a51226 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Wed, 21 Oct 2009 14:47:38 +0200 Subject: Fixed repo.alternates implementation which didn't work in the 'real' world with a non-mock test --- lib/git/repo.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'lib/git/repo.py') diff --git a/lib/git/repo.py b/lib/git/repo.py index 1c4b4095..ae9b94c3 100644 --- a/lib/git/repo.py +++ b/lib/git/repo.py @@ -455,24 +455,28 @@ class Repo(object): is the array of string paths representing the alternates at which git should look for objects, i.e. /home/user/repo/.git/objects - Raises - NoSuchPathError - + Raises + NoSuchPathError + + Note + The method does not check for the existance of the paths in alts + as the caller is responsible. + Returns None """ - for alt in alts: - if not os.path.exists(alt): - raise NoSuchPathError("Could not set alternates. Alternate path %s must exist" % alt) - + alternates_path = os.path.join(self.path, 'objects', 'info', 'alternates') if not alts: - os.remove(os.path.join(self.path, 'objects', 'info', 'alternates')) + if os.path.isfile(alternates_path): + os.remove(alternates_path) else: try: - f = open(os.path.join(self.path, 'objects', 'info', 'alternates'), 'w') + f = open(alternates_path, 'w') f.write("\n".join(alts)) finally: f.close() + # END file handling + # END alts handling alternates = property(_get_alternates, _set_alternates, doc="Retrieve a list of alternates paths or set a list paths to be used as alternates") -- cgit v1.2.1