[PATCH 2/5] Fix file listing when running import in empty repo

Lars R. Damerow lars at pixar.com
Sun Sep 7 03:25:23 UTC 2014


From: "Lars R. Damerow" <lars at pixar.com>

Before this change, the list of files generated for an empty repo would be
[''] instead of []. Now '' gets removed from the list and importing srpms into
an empty repo works properly.
---
 src/pyrpkg/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pyrpkg/__init__.py b/src/pyrpkg/__init__.py
index 9260894..2908c22 100644
--- a/src/pyrpkg/__init__.py
+++ b/src/pyrpkg/__init__.py
@@ -1295,6 +1295,8 @@ class Commands(object):
 
         # Get a list of files we're currently tracking
         ourfiles = self.repo.git.ls_files().split('\n')
+        if ourfiles == ['']:
+            ourfiles = []
         # Trim out sources and .gitignore
         for file in ('.gitignore', 'sources', ''):
             try:
-- 
1.8.3.1



More information about the buildsys mailing list