Commit fb88a41a authored by Gabriel Monnerat's avatar Gabriel Monnerat

Revert "remove git targets. It should be removed during the merge"

This reverts commit e3bff39d.
parent e3bff39d
...@@ -155,4 +155,5 @@ supervisor = 3.0a12 ...@@ -155,4 +155,5 @@ supervisor = 3.0a12
# Required by: # Required by:
# slapos.core==0.23 # slapos.core==0.23
>>>>>>> master
zope.interface = 3.8.0 zope.interface = 3.8.0
...@@ -109,3 +109,4 @@ def promise(args): ...@@ -109,3 +109,4 @@ def promise(args):
connection.getresponse() connection.getresponse()
return 0 return 0
>>>>>>> master
...@@ -172,11 +172,13 @@ class BaseRecipe(BaseSlapRecipe): ...@@ -172,11 +172,13 @@ class BaseRecipe(BaseSlapRecipe):
argument = argument + ["-d", mysql_conf['mysql_database'], argument = argument + ["-d", mysql_conf['mysql_database'],
"-H", mysql_conf['mysql_host'], "-P", mysql_conf['mysql_port'], "-H", mysql_conf['mysql_host'], "-P", mysql_conf['mysql_port'],
"-p", mysql_conf['mysql_password'], "-u", mysql_conf['mysql_user'], "-p", mysql_conf['mysql_password'], "-u", mysql_conf['mysql_user'],
=======
argument = [self.options['lampconfigure_directory'].strip(), argument = [self.options['lampconfigure_directory'].strip(),
"-H", mysql_conf['mysql_host'], "-P", mysql_conf['mysql_port'], "-H", mysql_conf['mysql_host'], "-P", mysql_conf['mysql_port'],
"-p", mysql_conf['mysql_password'], "-u", mysql_conf['mysql_user']] "-p", mysql_conf['mysql_password'], "-u", mysql_conf['mysql_user']]
if not self.options.has_key('file_token'): if not self.options.has_key('file_token'):
argument = argument + ["-d", mysql_conf['mysql_database'], argument = argument + ["-d", mysql_conf['mysql_database'],
>>>>>>> master
"--table", self.options['table_name'].strip(), "--cond", "--table", self.options['table_name'].strip(), "--cond",
self.options['constraint'].strip()] self.options['constraint'].strip()]
else: else:
...@@ -238,6 +240,7 @@ class Simple(BaseRecipe): ...@@ -238,6 +240,7 @@ class Simple(BaseRecipe):
rename=renamed, rename=renamed,
**mysql_conf **mysql_conf
)) ))
=======
renamed = self.configureInstallation(document_root, url, mysql_conf) renamed = self.configureInstallation(document_root, url, mysql_conf)
connectionDict = dict( connectionDict = dict(
url=url, url=url,
...@@ -246,6 +249,7 @@ class Simple(BaseRecipe): ...@@ -246,6 +249,7 @@ class Simple(BaseRecipe):
if not renamed == "": if not renamed == "":
connectionDict['rename'] = renamed connectionDict['rename'] = renamed
self.setConnectionDict(connectionDict) self.setConnectionDict(connectionDict)
>>>>>>> master
if self.options.has_key('template') and self.options.has_key('configuration'): if self.options.has_key('template') and self.options.has_key('configuration'):
self.createConfiguration(self.options['template'], document_root, self.createConfiguration(self.options['template'], document_root,
self.options['configuration'], mysql_conf) self.options['configuration'], mysql_conf)
......
...@@ -167,3 +167,4 @@ class GenericBaseRecipe(object): ...@@ -167,3 +167,4 @@ class GenericBaseRecipe(object):
url = urlparse.urlunparse((scheme, netloc, path, params, query, fragment)) url = urlparse.urlunparse((scheme, netloc, path, params, query, fragment))
return url return url
>>>>>>> master
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment