diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2010-08-05 15:54:56 +0200 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2010-08-05 15:54:56 +0200 |
| commit | 98bd5c0c383dd9ae5ab42e3da0d94563bdbb3105 (patch) | |
| tree | 41b0fb24d32fc779c2409a7f69664df236bc9e13 | |
| parent | 290d6343a59c0af0882d11efe0d7b57d0aa2dec7 (diff) | |
| download | fedora-packager-98bd5c0c383dd9ae5ab42e3da0d94563bdbb3105.tar.gz fedora-packager-98bd5c0c383dd9ae5ab42e3da0d94563bdbb3105.tar.xz fedora-packager-98bd5c0c383dd9ae5ab42e3da0d94563bdbb3105.zip | |
Import pyfedpkg.initial_merge via __init__.py
| -rwxr-xr-x | src/fedpkg.py | 3 | ||||
| -rw-r--r-- | src/pyfedpkg/__init__.py | 2 |
2 files changed, 3 insertions, 2 deletions
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' |