Update astropy_helpers patch

3 files changed, 7 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4b4ad5419164..086f466f4617 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python2-astropy-helpers
 	pkgdesc = Utilities used for building the Astropy python library for astronomy
 	pkgver = 2.0.7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/astropy/astropy-helpers
 	arch = any
 	license = BSD
diff --git a/PKGBUILD b/PKGBUILD
index 1a5ec283aca6..a98275795a9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Universebenzene <universebenzene at sina dot com>
 pkgname=('python2-astropy-helpers')
 pkgver=2.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Utilities used for building the Astropy python library for astronomy"
 arch=('any')
 url="https://github.com/astropy/astropy-helpers"
diff --git a/astropy_helpers.patch b/astropy_helpers.patch
index 1552f615b6f8..79cb70f9940d 100644
--- a/astropy_helpers.patch
+++ b/astropy_helpers.patch
@@ -1,11 +1,11 @@
---- a/astropy_helpers/commands/build_sphinx.py	2017-10-12 03:56:31.000000000 +0800
-+++ b/astropy_helpers/commands/build_sphinx.py	2018-02-06 21:49:54.599865388 +0800
+--- a/astropy_helpers/commands/build_sphinx.py	2018-06-01 10:01:50.000000000 +0800
++++ b/astropy_helpers/commands/build_sphinx.py	2018-06-19 11:44:47.802647397 +0800
 @@ -126,7 +126,7 @@
          build_cmd = self.get_finalized_command('build')
          build_cmd_path = os.path.abspath(build_cmd.build_lib)
  
 -        ah_importer = pkgutil.get_importer('astropy_helpers')
 +        ah_importer = pkgutil.get_importer('/usr/lib/python2.7/site-packages/astropy_helpers')
-         ah_path = os.path.abspath(ah_importer.path)
- 
-         # Now generate the source for and spawn a new process that runs the
+         if ah_importer is None:
+             ah_path = '.'
+         else: