[Python-apps-commits] r12119 - in packages/mercurial/trunk/debian/patches (5 files)

[vicho at users.alioth.debian.org]

    Date: Tuesday, July 21, 2015 @ 16:04:55
  Author: vicho
Revision: 12119

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch
  packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.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__fix_fhs_paths.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch	2015-07-21 16:04:49 UTC (rev 12118)
+++ packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch	2015-07-21 16:04:55 UTC (rev 12119)
@@ -9,7 +9,7 @@
 
 --- a/mercurial/util.py
 +++ b/mercurial/util.py
-@@ -621,6 +621,8 @@ def mainfrozen():
+@@ -697,6 +697,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__hgk.py.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2015-07-21 16:04:49 UTC (rev 12118)
+++ packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2015-07-21 16:04:55 UTC (rev 12119)
@@ -2,7 +2,7 @@
 
 --- a/hgext/hgk.py
 +++ b/hgext/hgk.py
-@@ -326,6 +326,6 @@ def view(ui, repo, *etc, **opts):
+@@ -330,6 +330,6 @@ def view(ui, repo, *etc, **opts):
      if repo.filtername is None:
          optstr += '--hidden'
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2015-07-21 16:04:49 UTC (rev 12118)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2015-07-21 16:04:55 UTC (rev 12119)
@@ -2,10 +2,10 @@
 
 --- a/hgext/bugzilla.py
 +++ b/hgext/bugzilla.py
-@@ -354,7 +354,8 @@ class bzmysql(bzaccess):
+@@ -358,7 +358,8 @@ class bzmysql(bzaccess):
              import MySQLdb as mysql
              bzmysql._MySQLdb = mysql
-         except ImportError, err:
+         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')
@@ -100,7 +100,7 @@
  
 --- a/hgext/convert/monotone.py
 +++ b/hgext/convert/monotone.py
-@@ -66,7 +66,7 @@ class monotone_source(converter_source,
+@@ -69,7 +69,7 @@ class monotone_source(converter_source,
          self.files = None
          self.dirs  = None
  
@@ -142,7 +142,7 @@
  
          self.lastrevs = {}
  
-@@ -1089,6 +1093,8 @@ class svn_sink(converter_sink, commandli
+@@ -1094,6 +1098,8 @@ class svn_sink(converter_sink, commandli
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2015-07-21 16:04:49 UTC (rev 12118)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2015-07-21 16:04:55 UTC (rev 12119)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2373,8 +2373,8 @@ def debuginstall(ui):
+@@ -2385,8 +2385,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
-@@ -879,7 +879,7 @@ class ui(object):
+@@ -882,7 +882,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -349,7 +349,7 @@
      This is used by Python to find imported modules and may need to be
 --- a/mercurial/help/config.txt
 +++ b/mercurial/help/config.txt
-@@ -1359,7 +1359,8 @@ User interface controls.
+@@ -1409,7 +1409,8 @@ User interface controls.
      Print debugging information. True or False. Default is False.
  
  ``editor``

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-07-21 16:04:49 UTC (rev 12118)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2015-07-21 16:04:55 UTC (rev 12119)
@@ -9,7 +9,7 @@
 
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -1858,7 +1858,7 @@ class TestRunner(object):
+@@ -1994,7 +1994,7 @@ class TestRunner(object):
                   sys.executable)
              mypython = os.path.join(self._tmpbindir, pyexename)
              try:
@@ -17,4 +17,4 @@
 +                if (mypython == sys.executable) or (os.readlink(mypython) == sys.executable):
                      return
                  os.unlink(mypython)
-             except OSError, err:
+             except OSError as err: