diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-01-21 11:09:39 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-01-21 11:09:39 +0100 |
| commit | 7a70e8ab79d46d06271c75be1f726fd164cbf9ce (patch) | |
| tree | d11f53e95819d9252e434e46f36f7effbc5f2c8b /src/pyfedpkg/__init__.py | |
| parent | 06fda5ee1e0338330e44bc0d08ca5026e4fb5618 (diff) | |
| parent | 39b9be927e4cbbfeed1ee2e28a1badde0db5c19d (diff) | |
| download | fedora-packager-7a70e8ab79d46d06271c75be1f726fd164cbf9ce.tar.gz fedora-packager-7a70e8ab79d46d06271c75be1f726fd164cbf9ce.tar.xz fedora-packager-7a70e8ab79d46d06271c75be1f726fd164cbf9ce.zip | |
Merge branch '4/initial-merge' into 4/ALL4/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 a1edb35..9c76fc0 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): |