diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2010-08-10 13:13:15 +0200 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2010-08-13 14:03:16 +0200 |
| commit | 31aff9515f77a0d95140e07ce5f95d6db784e9b9 (patch) | |
| tree | 450262071ff58040f3df639c6fc749d38970e3d9 /src/pyfedpkg/__init__.py | |
| parent | d25fdc05a742669ffa100f26a0e0665fde73fbed (diff) | |
| download | fedora-packager-enh/initial-merge.tar.gz fedora-packager-enh/initial-merge.tar.xz fedora-packager-enh/initial-merge.zip | |
Add "fedpkg clone --initial-merge" argumentenh/initial-merge
Diffstat (limited to 'src/pyfedpkg/__init__.py')
| -rw-r--r-- | src/pyfedpkg/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py index dbd0878..5d764b8 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -28,8 +28,6 @@ import stat import StringIO import OpenSSL -from . import initial_merge - # Define some global variables, put them here to make it easy to change LOOKASIDE = 'http://pkgs.fedoraproject.org/repo/pkgs' @@ -46,6 +44,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): |