[Checkins] SVN: Sandbox/thefunny42/kgs.test/trunk/src/kgs_test.py Fix conflict correctly.
Sylvain Viollon
sylvain at infrae.com
Tue Jan 27 12:27:27 EST 2009
Log message for revision 95231:
Fix conflict correctly.
Changed:
U Sandbox/thefunny42/kgs.test/trunk/src/kgs_test.py
-=-
Modified: Sandbox/thefunny42/kgs.test/trunk/src/kgs_test.py
===================================================================
--- Sandbox/thefunny42/kgs.test/trunk/src/kgs_test.py 2009-01-27 17:23:33 UTC (rev 95230)
+++ Sandbox/thefunny42/kgs.test/trunk/src/kgs_test.py 2009-01-27 17:27:27 UTC (rev 95231)
@@ -115,12 +115,10 @@
# Released version
kgs_env = Environment([EGG_CACHE,])
kgs_ws = WorkingSet(kgs_env)
+ easy_install.install([project],
+ os.path.abspath(EGG_CACHE),
+ working_set=kgs_ws, newest=True)
packages = kgs_env[project]
- if not len(packages):
- easy_install.install([project],
- os.path.abspath(EGG_CACHE),
- working_set=kgs_ws, newest=True)
- packages = kgs_env[project]
kgs_conf.write("""
[test-%s]
More information about the Checkins
mailing list