Commit 263a6072 authored by Christian Köstlin's avatar Christian Köstlin

Fixes #7 - fixes crash in repo status -o

parent 5363efc0
...@@ -117,7 +117,7 @@ the following meanings: ...@@ -117,7 +117,7 @@ the following meanings:
status_header = ' --\t' status_header = ' --\t'
for item in dirs: for item in dirs:
if not os.path.isdir(item): if not os.path.isdir(item):
outstring.write(''.join([status_header, item])) outstring.write(''.join([status_header, item, '\n']))
continue continue
if item in proj_dirs: if item in proj_dirs:
continue continue
...@@ -126,7 +126,7 @@ the following meanings: ...@@ -126,7 +126,7 @@ the following meanings:
glob.glob('%s/*' % item), \ glob.glob('%s/*' % item), \
proj_dirs, proj_dirs_parents, outstring) proj_dirs, proj_dirs_parents, outstring)
continue continue
outstring.write(''.join([status_header, item, '/'])) outstring.write(''.join([status_header, item, '/', '\n']))
def Execute(self, opt, args): def Execute(self, opt, args):
all_projects = self.GetProjects(args) all_projects = self.GetProjects(args)
...@@ -182,18 +182,20 @@ the following meanings: ...@@ -182,18 +182,20 @@ the following meanings:
try: try:
os.chdir(self.manifest.topdir) os.chdir(self.manifest.topdir)
outstring = io.StringIO.StringIO() outstring = io.StringIO()
self._FindOrphans(glob.glob('.*') + \ self._FindOrphans(glob.glob('.*') + \
glob.glob('*'), \ glob.glob('*'), \
proj_dirs, proj_dirs_parents, outstring) proj_dirs, proj_dirs_parents, outstring)
if outstring.buflist: if outstring.tell() > 0:
output = StatusColoring(self.manifest.globalConfig) output = StatusColoring(self.manifest.globalConfig)
output.project('Objects not within a project (orphans)') output.project('Objects not within a project (orphans)')
output.nl() output.nl()
for entry in outstring.buflist: outstring.seek(0)
output.untracked(entry) lines = outstring.readlines()
output.nl() for line in lines[0:len(lines)-1]:
output.untracked(line)
output.untracked(str.rstrip(lines[len(lines)-1]))
else: else:
print('No orphan files or directories') print('No orphan files or directories')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment