From 98bd5c0c383dd9ae5ab42e3da0d94563bdbb3105 Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Thu, 5 Aug 2010 15:54:56 +0200
Subject: Import pyfedpkg.initial_merge via __init__.py

---
 src/fedpkg.py            | 3 +--
 src/pyfedpkg/__init__.py | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/fedpkg.py b/src/fedpkg.py
index 01e4e44..061b019 100755
--- a/src/fedpkg.py
+++ b/src/fedpkg.py
@@ -12,7 +12,6 @@
 
 import argparse
 import pyfedpkg
-import pyfedpkg.initial_merge as initial_merge
 import fedora_cert
 import os
 import sys
@@ -937,7 +936,7 @@ packages will be built sequentially.
     parser_verrel.set_defaults(command = verrel)
 
     # Initial branch merges
-    parser_initial_merge = initial_merge.get_parser(subparsers)
+    parser_initial_merge = pyfedpkg.initial_merge.get_parser(subparsers)
 
     # Parse the args
     args = parser.parse_args()
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py
index fe4f3a0..1df460a 100644
--- a/src/pyfedpkg/__init__.py
+++ b/src/pyfedpkg/__init__.py
@@ -28,6 +28,8 @@ 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'
-- 
cgit