# HG changeset patch # User Sylvain Thénault # Date 1266481324 -3600 # Node ID 790181bfd19c2433d4d3d98620732f6a240c5eac # Parent fe1c5a46a1cb6163041adb77df15224285e6052e specify db port on backup/restore commands (require forth comming lgc 0.48.1) diff -r fe1c5a46a1cb -r 790181bfd19c debian/control --- a/debian/control Thu Feb 18 08:39:30 2010 +0100 +++ b/debian/control Thu Feb 18 09:22:04 2010 +0100 @@ -77,7 +77,7 @@ Package: cubicweb-common Architecture: all XB-Python-Version: ${python:Versions} -Depends: ${python:Depends}, graphviz, gettext, python-logilab-mtconverter (>= 0.6.0), python-logilab-common (>= 0.47.0), python-yams (>= 0.27.0), python-rql (>= 0.24.0), python-lxml +Depends: ${python:Depends}, graphviz, gettext, python-logilab-mtconverter (>= 0.6.0), python-logilab-common (>= 0.48.1), python-yams (>= 0.27.0), python-rql (>= 0.24.0), python-lxml Recommends: python-simpletal (>= 4.0), python-crypto Conflicts: cubicweb-core Replaces: cubicweb-core diff -r fe1c5a46a1cb -r 790181bfd19c server/sqlutils.py --- a/server/sqlutils.py Thu Feb 18 08:39:30 2010 +0100 +++ b/server/sqlutils.py Thu Feb 18 09:22:04 2010 +0100 @@ -178,6 +178,7 @@ def backup_to_file(self, backupfile): for cmd in self.dbhelper.backup_commands(self.dbname, self.dbhost, self.dbuser, backupfile, + dbport=self.dbport, keepownership=False): if _run_command(cmd): if not confirm(' [Failed] Continue anyway?', default='n'): @@ -187,6 +188,7 @@ for cmd in self.dbhelper.restore_commands(self.dbname, self.dbhost, self.dbuser, backupfile, self.encoding, + dbport=self.dbport, keepownership=False, drop=drop): if _run_command(cmd):