diff options
| author | Javi Merino <vicho@debian.org> | 2014-08-17 21:28:35 +0000 |
|---|---|---|
| committer | Javi Merino <vicho@debian.org> | 2014-08-17 21:28:35 +0000 |
| commit | dcaf2f467109499343b970869da841cdac284828 (patch) | |
| tree | 1690e2b57c114410ba6f31697b1981bb9844e589 | |
| parent | 169e5393182bfeb91139b9a91847f57ad419e715 (diff) | |
Remove patch from_upstream__layouts_fix_crash_when_importing_hgext_hgsubversion which is now included upstream
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/from_upstream__layouts_fix_crash_when_importing_hgext_hgsubversion.patch | 28 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 3 insertions, 29 deletions
diff --git a/debian/changelog b/debian/changelog index e44c26b..1c8be24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ hgsubversion (1.6.3-1) UNRELEASED; urgency=medium * New upstream release * Add myself as uploader + * Remove patch + from_upstream__layouts_fix_crash_when_importing_hgext_hgsubversion + which is now included upstream -- Javi Merino <vicho@debian.org> Sun, 17 Aug 2014 10:14:20 +0100 diff --git a/debian/patches/from_upstream__layouts_fix_crash_when_importing_hgext_hgsubversion.patch b/debian/patches/from_upstream__layouts_fix_crash_when_importing_hgext_hgsubversion.patch deleted file mode 100644 index 14ecb8b..0000000 --- a/debian/patches/from_upstream__layouts_fix_crash_when_importing_hgext_hgsubversion.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Sean Farley <sean.michael.farley@gmail.com> -Bug: https://bugs.debian.org/742080 -Origin: upstream, https://bitbucket.org/durin42/hgsubversion/commits/0f16e11b2c2bccb2f92d5f9a741d031eac344769?at=default -Subject: layouts: fix crash when importing hgext_hgsubversion - -This change was introduced in 4a92eb1484ba and fixed importing issues for -mercurial < 2.8. Unfortunately, this broke imports for newer versions of -mercurial that have hgsubversion installed in sys.path. - -We now wrap the import in a try-block to catch this ImportError. - -diff --git a/hgsubversion/layouts/standard.py b/hgsubversion/layouts/standard.py ---- a/hgsubversion/layouts/standard.py -+++ b/hgsubversion/layouts/standard.py -@@ -57,7 +57,12 @@ class StandardLayout(base.BaseLayout): - - def taglocations(self, meta_data_dir): - # import late to avoid trouble when running the test suite -- from hgext_hgsubversion import util -+ try: -+ # newer versions of mercurial >= 2.8 will import this because the -+ # hgext_ logic is already being done in core -+ from hgsubversion import util -+ except ImportError: -+ from hgext_hgsubversion import util - - if self._tag_locations is None: - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 4ff9771..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -from_upstream__layouts_fix_crash_when_importing_hgext_hgsubversion.patch |