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> | 2011-01-11 15:56:11 +0100 |
commit | 8b73d6cb31d0a3fed328acd31d524a671238f51a (patch) | |
tree | 71ef34c193717ed8378268d565395abcc98884fc /src/pyfedpkg/__init__.py | |
parent | c3f6a19ac55170baa33fbbfb583ff3f0d4ad2710 (diff) | |
download | fedora-packager-8b73d6cb31d0a3fed328acd31d524a671238f51a.tar.gz fedora-packager-8b73d6cb31d0a3fed328acd31d524a671238f51a.tar.xz fedora-packager-8b73d6cb31d0a3fed328acd31d524a671238f51a.zip |
Add "fedpkg clone --initial-merge" argumentinitial-merge/3
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 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): |