summaryrefslogtreecommitdiffstats
path: root/src/pyfedpkg/__init__.py
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2010-08-10 13:13:15 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2011-01-21 11:00:22 +0100
commit39b9be927e4cbbfeed1ee2e28a1badde0db5c19d (patch)
tree644365d61d1bc642f341ec55f933df30311e2b7e /src/pyfedpkg/__init__.py
parentbd606390a95b6364b90dedcc4bfcbd6d3ad76dd6 (diff)
downloadfedora-packager-39b9be927e4cbbfeed1ee2e28a1badde0db5c19d.tar.gz
fedora-packager-39b9be927e4cbbfeed1ee2e28a1badde0db5c19d.tar.xz
fedora-packager-39b9be927e4cbbfeed1ee2e28a1badde0db5c19d.zip
Add "fedpkg clone --initial-merge" argument4/initial-merge
Diffstat (limited to 'src/pyfedpkg/__init__.py')
-rw-r--r--src/pyfedpkg/__init__.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py
index 51982ea..9c76fc0 100644
--- a/src/pyfedpkg/__init__.py
+++ b/src/pyfedpkg/__init__.py
@@ -31,8 +31,6 @@ import OpenSSL
import fnmatch
import offtrac
-from . import initial_merge
-
# Define some global variables, put them here to make it easy to change
LOOKASIDE = 'http://pkgs.fedoraproject.org/repo/pkgs'
@@ -50,6 +48,11 @@ BRANCHFILTER = 'f\d\d\/master|master|el\d\/master|olpc\d\/master'
class FedpkgError(Exception):
pass
+
+# This module needs FedpkgError to be defined
+from . import initial_merge
+
+
# Setup our logger
# Null logger to avoid spurrious messages, add a handler in app code
class NullHandler(logging.Handler):