From b1e4aa229b3aea154f8c9c0b945d440f3809fc04 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Fri, 1 May 2009 11:22:56 +0200 Subject: [PATCH] use instance checkout_mode instead of global config value It is possible to override checkout_mode for individual modules in .jhbuildrc so the global configuration value should not be used in get_checkoudir(). --- jhbuild/versioncontrol/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jhbuild/versioncontrol/__init__.py b/jhbuild/versioncontrol/__init__.py index b5dd4bff..518638a4 100644 --- a/jhbuild/versioncontrol/__init__.py +++ b/jhbuild/versioncontrol/__init__.py @@ -93,7 +93,7 @@ class Branch: raise NotImplementedError def get_checkoutdir(self): - if self.config.checkout_mode == 'copy' and self.config.copy_dir: + if self.checkout_mode == 'copy' and self.config.copy_dir: return os.path.join(self.config.copy_dir, os.path.basename(self.module)) if self.checkoutdir: return os.path.join(self.checkoutroot, self.checkoutdir) -- 2.11.4.GIT