diff options
author | Jesse Keating <jkeating@redhat.com> | 2010-06-23 18:45:28 -0700 |
---|---|---|
committer | Jesse Keating <jkeating@redhat.com> | 2010-06-23 18:45:28 -0700 |
commit | de54e4350bec675ad9ded1dc745aae3c5887de1a (patch) | |
tree | aadd059d5070c91ea8bf4dbf86e794841bd9746d /src/pyfedpkg/__init__.py | |
parent | 319e6da586aef412f027a78c6247e0d09788e980 (diff) | |
download | fedora-packager-de54e4350bec675ad9ded1dc745aae3c5887de1a.tar.gz fedora-packager-de54e4350bec675ad9ded1dc745aae3c5887de1a.tar.xz fedora-packager-de54e4350bec675ad9ded1dc745aae3c5887de1a.zip |
Better handle imports when not all the files pre-exist.
This will be useful when we start importing into fresh blank repos, but
that still needs more work.
Diffstat (limited to 'src/pyfedpkg/__init__.py')
-rw-r--r-- | src/pyfedpkg/__init__.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py index bf5fb12..bf9481f 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -579,8 +579,15 @@ class PackageModule: # Get a list of files we're currently tracking ourfiles = self.repo.git.ls_files().split() # Trim out sources and .gitignore - ourfiles.remove('.gitignore') - ourfiles.remove('sources') + try: + ourfiles.remove('.gitignore') + ourfiles.remove('sources') + except ValueError: + pass + try: + ourfiles.remove('sources') + except ValueError: + pass # Things work better if we're in our module directory oldpath = os.getcwd() @@ -609,11 +616,14 @@ class PackageModule: raise FedpkgError("Got an error from rpm2cpio: %s" % err) # now process the upload files - self.new_sources(uploadfiles) + if uploadfiles: + self.new_sources(uploadfiles) # And finally add all the files we know about (and our stock files) for file in ('.gitignore', 'sources'): - if os.path.exists(file): - files.append(file) + if not os.path.exists(file): + # Create the file + open(file, 'w').close() + files.append(file) rv = self.repo.index.add(files) # Return to the caller and let them take it from there. os.chdir(oldpath) |