diff options
author | Jesse Keating <jkeating@redhat.com> | 2010-07-08 17:34:51 -0700 |
---|---|---|
committer | Dennis Gilmore <dennis@ausil.us> | 2010-07-08 19:44:55 -0500 |
commit | 69a5e65d7488b8295856e29ab5f6358eb6c47aba (patch) | |
tree | 76484d1e145ecfd9cf631790065aecb8b862b248 /src/pyfedpkg | |
parent | 32dab84b654b528b773a0ad4224dd3091679f605 (diff) | |
download | fedora-packager-69a5e65d7488b8295856e29ab5f6358eb6c47aba.tar.gz fedora-packager-69a5e65d7488b8295856e29ab5f6358eb6c47aba.tar.xz fedora-packager-69a5e65d7488b8295856e29ab5f6358eb6c47aba.zip |
Handle importing an srpm into an empty repo
In the case of a fresh module created upstream, we don't have a spec
file to use for information, so we have to make a git repo outside of
the module.
Diffstat (limited to 'src/pyfedpkg')
-rw-r--r-- | src/pyfedpkg/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py index 920c85e..709e922 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -356,11 +356,9 @@ def get_latest_commit(module): # Return the hash sum return output.split()[0] -def import_srpm(repo, srpm, path=os.getcwd()): +def import_srpm(srpm, path=os.getcwd()): """Import the contents of an srpm into a repo. - repo: a git repo object to use for the import - srpm: File to import contents from path: optional path to work in, defaults to cwd. @@ -378,6 +376,7 @@ def import_srpm(repo, srpm, path=os.getcwd()): if not os.path.exists(srpm): raise FedpkgError('File not found.') # bail if we're dirty + repo = git.Repo(path) if repo.is_dirty(): raise FedpkgError('There are uncommitted changes in your repo') # Get the details of the srpm |