[Python-apps-commits] r12527 - in packages/mercurial/trunk/debian/patches (5 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Sun Oct 25 16:20:57 UTC 2015
Date: Sunday, October 25, 2015 @ 16:20:56
Author: vicho
Revision: 12527
Refresh patches
Modified:
packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch
packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
Modified: packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch 2015-10-25 16:20:49 UTC (rev 12526)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch 2015-10-25 16:20:56 UTC (rev 12527)
@@ -11,7 +11,7 @@
--- a/setup.py
+++ b/setup.py
-@@ -471,7 +471,6 @@ cmdclass = {'build': hgbuild,
+@@ -475,7 +475,6 @@ cmdclass = {'build': hgbuild,
'build_py': hgbuildpy,
'build_hgextindex': buildhgextindex,
'install_lib': hginstalllib,
Modified: packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch 2015-10-25 16:20:49 UTC (rev 12526)
+++ packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch 2015-10-25 16:20:56 UTC (rev 12527)
@@ -9,7 +9,7 @@
--- a/mercurial/util.py
+++ b/mercurial/util.py
-@@ -697,6 +697,8 @@ def mainfrozen():
+@@ -700,6 +700,8 @@ def mainfrozen():
if mainfrozen():
# executable version (py2exe) doesn't support __file__
datapath = os.path.dirname(sys.executable)
Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2015-10-25 16:20:49 UTC (rev 12526)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2015-10-25 16:20:56 UTC (rev 12527)
@@ -6,9 +6,9 @@
import MySQLdb as mysql
bzmysql._MySQLdb = mysql
except ImportError as err:
-- raise util.Abort(_('python mysql support not available: %s') % err)
-+ raise util.Abort(_('python mysql support not available: %s') % err +
-+ _(' (try installing the %s package)') % 'python-mysqldb')
+- raise error.Abort(_('python mysql support not available: %s') % err)
++ raise error.Abort(_('python mysql support not available: %s') % err +
++ _(' (try installing the %s package)') % 'python-mysqldb')
bzaccess.__init__(self, ui)
@@ -35,12 +35,12 @@
name = name or exe
if not util.findexe(exe):
if abort:
- exc = util.Abort
+ exc = error.Abort
else:
exc = MissingTool
- raise exc(_('cannot find required "%s" tool') % name)
+ raise exc(_('cannot find required "%s" tool') % name +
-+ (debname and _(' (try installing the %s package)') % debname or ''))
++ (debname and _(' (try installing the %s package)') % debname or ''))
class NoRepo(Exception):
pass
@@ -65,13 +65,13 @@
+ checktool('darcs', debname='darcs')
version = self.run0('--version').splitlines()[0].strip()
if version < '2.1':
- raise util.Abort(_('darcs version 2.1 or newer needed (found %r)') %
- version)
+ raise error.Abort(_('darcs version 2.1 or newer needed (found %r)')
+ % version)
if "ElementTree" not in globals():
-- raise util.Abort(_("Python ElementTree module is not available"))
-+ raise util.Abort(_("Python ElementTree module is not available") +
-+ _(" (try installing the %s package)") % 'python-celementtree')
+- raise error.Abort(_("Python ElementTree module is not available"))
++ raise error.Abort(_("Python ElementTree module is not available") +
++ _(" (try installing the %s package)") % 'python-celementtree')
self.path = os.path.realpath(path)
@@ -92,9 +92,9 @@
if util.findexe('tla'):
self.execmd = 'tla'
else:
-- raise util.Abort(_('cannot find a GNU Arch tool'))
-+ raise util.Abort(_('cannot find a GNU Arch tool') +
-+ _(' (try installing the %s package)') % 'tla')
+- raise error.Abort(_('cannot find a GNU Arch tool'))
++ raise error.Abort(_('cannot find a GNU Arch tool') +
++ _(' (try installing the %s package)') % 'tla')
commandline.__init__(self, ui, self.execmd)
@@ -157,9 +157,9 @@
import OpenSSL
OpenSSL.SSL.Context
except ImportError:
-- raise util.Abort(_("SSL support is unavailable"))
-+ raise util.Abort(_("SSL support is unavailable") +
-+ _(" (try installing the %s package)") % 'python-openssl')
+- raise error.Abort(_("SSL support is unavailable"))
++ raise error.Abort(_("SSL support is unavailable") +
++ _(" (try installing the %s package)") % 'python-openssl')
ctx = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD)
ctx.use_privatekey_file(ssl_cert)
ctx.use_certificate_file(ssl_cert)
@@ -167,9 +167,9 @@
import ssl
ssl.wrap_socket
except ImportError:
-- raise util.Abort(_("SSL support is unavailable"))
-+ raise util.Abort(_("SSL support is unavailable") +
-+ _(" (try installing the %s package)") % 'python-openssl')
+- raise error.Abort(_("SSL support is unavailable"))
++ raise error.Abort(_("SSL support is unavailable") +
++ _(" (try installing the %s package)") % 'python-openssl')
httpserver.socket = ssl.wrap_socket(
httpserver.socket, server_side=True,
certfile=ssl_cert, ssl_version=ssl.PROTOCOL_TLSv1)
Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2015-10-25 16:20:49 UTC (rev 12526)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2015-10-25 16:20:56 UTC (rev 12527)
@@ -13,7 +13,7 @@
EDITOR="$EDITOR -nw"
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
-@@ -2385,8 +2385,8 @@ def debuginstall(ui):
+@@ -2471,8 +2471,8 @@ def debuginstall(ui):
editor = util.expandpath(editor)
cmdpath = util.findexe(shlex.split(editor)[0])
if not cmdpath:
@@ -26,7 +26,7 @@
else:
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
-@@ -882,7 +882,7 @@ class ui(object):
+@@ -914,7 +914,7 @@ class ui(object):
# avoid confusion.
editor = 'E'
else:
@@ -349,13 +349,13 @@
This is used by Python to find imported modules and may need to be
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
-@@ -1409,7 +1409,8 @@ User interface controls.
- Print debugging information. True or False. Default is False.
+@@ -1440,7 +1440,8 @@ User interface controls.
+ Print debugging information. (default: False)
``editor``
-- The editor to use during a commit. Default is ``$EDITOR`` or ``vi``.
-+ The editor to use during a commit. Default is ``$EDITOR`` or
-+ ``sensible-editor``.
+- The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)
++ The editor to use during a commit. (default: ``$EDITOR`` or
++ ``sensible-editor``)
``fallbackencoding``
Encoding to try if it's not possible to decode the changelog using
Modified: packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch 2015-10-25 16:20:49 UTC (rev 12526)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch 2015-10-25 16:20:56 UTC (rev 12527)
@@ -9,7 +9,7 @@
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
-@@ -1994,7 +1994,7 @@ class TestRunner(object):
+@@ -2006,7 +2006,7 @@ class TestRunner(object):
sys.executable)
mypython = os.path.join(self._tmpbindir, pyexename)
try:
More information about the Python-apps-commits
mailing list