summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2011-02-10 16:39:03 +0100
committerJesse Keating <jkeating@redhat.com>2011-02-09 20:36:46 -0700
commit6faf450a35601ceb8bafeb9e4f2fdd1a7c0304f9 (patch)
treeb6814ef80d86f9241df525bfb8c770823705dfbe
parentb078a5862615dcb328f7441fb2bd006f824be0d1 (diff)
downloadfedora-packager-6faf450a35601ceb8bafeb9e4f2fdd1a7c0304f9.zip
fedora-packager-6faf450a35601ceb8bafeb9e4f2fdd1a7c0304f9.tar.gz
fedora-packager-6faf450a35601ceb8bafeb9e4f2fdd1a7c0304f9.tar.xz
Move location/name of man_page module
Move location/name of man_page module (out of the pyfedpkg module/namespace) in order to avoid importing pyfedpkg for man page generation.
-rw-r--r--Makefile.am4
-rwxr-xr-xsrc/fedpkg.py8
-rw-r--r--src/fedpkg_man_page.py (renamed from src/pyfedpkg/man_page.py)0
3 files changed, 4 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 506ad96..0d79b06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -94,8 +94,8 @@ fedpkg.1: fedpkg
fi
endif
-noinst_PYTHON = $(srcdir)/src/pyfedpkg/man_page.py
-pyfedpkg_PYTHON = $(filter-out $(noinst_PYTHON),$(wildcard $(srcdir)/src/pyfedpkg/*.py))
+noinst_PYTHON = $(srcdir)/src/fedpkg_man_page.py
+pyfedpkg_PYTHON = $(wildcard $(srcdir)/src/pyfedpkg/*.py)
fedora_cert_PYTHON = $(wildcard $(srcdir)/src/fedora_cert/*.py)
fedora_certdir = $(pythondir)/fedora_cert
diff --git a/src/fedpkg.py b/src/fedpkg.py
index 4275f5f..91a7b5d 100755
--- a/src/fedpkg.py
+++ b/src/fedpkg.py
@@ -1428,12 +1428,8 @@ defined, packages will be built sequentially.""")
return parser.parse_args()
else:
# Generate the man page
-
- # Use the "as man_page" part to avoid overwriting the pyfedpkg
- # namespace, which would break all usage of pyfedpkg.* outside
- # of this else branch.
- import pyfedpkg.man_page as man_page
- man_page.generate(parser, subparsers)
+ import fedpkg_man_page
+ fedpkg_man_page.generate(parser, subparsers)
sys.exit(0)
# no return possible
diff --git a/src/pyfedpkg/man_page.py b/src/fedpkg_man_page.py
index 117ad62..117ad62 100644
--- a/src/pyfedpkg/man_page.py
+++ b/src/fedpkg_man_page.py