@@ -6,7 +6,7 @@ setup( author_email='zerok@zerokspot.com', description='Simple zc.buildout recipe for sources in a git repository', long_description = open('README.rst', 'r').read(), - version='0.4.1', + version='0.4.2', url='http://github.com/zerok/zerokspot.gitrecipe/', install_requires=['setuptools', 'zc.buildout'], namespace_packages=['zerokspot'], setup.py @@ -93,6 +93,8 @@ class Recipe(object): self.cache_path = os.path.join( buildout['buildout']['download-cache'], self.cache_name) + else: + self.cache_path = None options['location'] = os.path.join( buildout['buildout']['parts-directory'], name) self.as_egg = options.get('as_egg', 'false').lower() == 'true' @@ -147,7 +149,7 @@ class Recipe(object): if self.rev is None and self.newest: # Do an update of the current branch print "Pulling updates from origin" - if not self.cache_install: + if not self.cache_install and self.download_cache: self._update_cache() self._update_part() os.chdir(self.options['location']) zerokspot/recipe/git/__init__.py @@ -87,7 +87,7 @@ class RecipeTests(unittest.TestCase): def testFetch(self): """ - Tests if the basic cloning of the repository works. + Tests if the basic cloning and updating of the repository works. """ testing.write(self.tempdir, 'buildout.cfg', """ @@ -100,6 +100,7 @@ repository = %(repo)s """ % {'repo' : self.temprepo}) self._buildout() self.assertTrue(os.path.exists(os.path.join(self.tempdir, 'parts', 'gittest', 'test.txt'))) + self._buildout() def testRaiseExceptionOnAbsentCache(self): """ @@ -146,6 +147,7 @@ repository = %(repo)s # now install from cache build = self._buildout([('buildout', 'install-from-cache', 'true')]) self.assertTrue(build['gittest'].recipe.installed_from_cache) + build = self._buildout([('buildout', 'install-from-cache', 'true')]) def testNonstandardBranch(self): """ @@ -165,6 +167,7 @@ repository = %(repo)s recipe = build['gittest'].recipe self.assertTrue(os.path.exists(os.path.join(recipe.cache_path, 'test2.txt'))) self.assertTrue(os.path.exists(os.path.join(recipe.options['location'], 'test2.txt'))) + self._buildout() if __name__ == '__main__': sys.path.insert(0, os.path.normpath( zerokspot/recipe/git/tests.py 4b1eaedb659373ba1d22ec4d86c2e011704c5936 Horst Gutmann zerok@zerokspot.com http://github.com/zerok/zerokspot.gitrecipe/commit/a009a3fa88e6862baad1268688c7634395b2177e a009a3fa88e6862baad1268688c7634395b2177e 2009-07-05T04:31:11-07:00 2009-07-05T04:31:11-07:00 Fix for update-problem. Fixes #1 29b84a2e3c6019cd2d5cac5cb1df3f575040ee5d Horst Gutmann zerok@zerokspot.com