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-02-01 16:23:45 +0100 |
| commit | 18ea3c13dc5bcda0c086efe11809795773f5167b (patch) | |
| tree | 3c0cf9658ff6894d796df5697176ce0ad403897e /src/pyfedpkg/__init__.py | |
| parent | c139cc05d3101187d7292e220b1734bb03be99da (diff) | |
| download | fedora-packager-18ea3c13dc5bcda0c086efe11809795773f5167b.tar.gz fedora-packager-18ea3c13dc5bcda0c086efe11809795773f5167b.tar.xz fedora-packager-18ea3c13dc5bcda0c086efe11809795773f5167b.zip | |
Add "fedpkg clone --initial-merge" argument5/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 83b54f7..401f738 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): |