diff options
author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-02-05 01:24:34 +0100 |
---|---|---|
committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-02-05 01:24:34 +0100 |
commit | 0f49c4e1336138ee8909bc76ad636878d067e60e (patch) | |
tree | 4397ff3c3f0b56b437814c7e662197cfba6580a4 /src/pyfedpkg/__init__.py | |
parent | 2580fd3d05d6e2d0c13cf0dbfecb09302a381937 (diff) | |
parent | 18ea3c13dc5bcda0c086efe11809795773f5167b (diff) | |
download | fedora-packager-0f49c4e1336138ee8909bc76ad636878d067e60e.tar.gz fedora-packager-0f49c4e1336138ee8909bc76ad636878d067e60e.tar.xz fedora-packager-0f49c4e1336138ee8909bc76ad636878d067e60e.zip |
Merge branch '5/initial-merge' into 5/ALL
Diffstat (limited to 'src/pyfedpkg/__init__.py')
-rw-r--r-- | src/pyfedpkg/__init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py index edcbbd8..6b9682e 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -48,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): |