From 31aff9515f77a0d95140e07ce5f95d6db784e9b9 Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Tue, 10 Aug 2010 13:13:15 +0200
Subject: Add "fedpkg clone --initial-merge" argument

---
 src/pyfedpkg/__init__.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/pyfedpkg/__init__.py')

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):
-- 
cgit