Commit 631893d7 authored by thetc86's avatar thetc86

Merge pull request #8 from gizmomogwai/master

Fixes #7 - fixes crash in repo status -o
parents 5363efc0 263a6072
......@@ -117,7 +117,7 @@ the following meanings:
status_header = ' --\t'
for item in dirs:
if not os.path.isdir(item):
outstring.write(''.join([status_header, item]))
outstring.write(''.join([status_header, item, '\n']))
continue
if item in proj_dirs:
continue
......@@ -126,7 +126,7 @@ the following meanings:
glob.glob('%s/*' % item), \
proj_dirs, proj_dirs_parents, outstring)
continue
outstring.write(''.join([status_header, item, '/']))
outstring.write(''.join([status_header, item, '/', '\n']))
def Execute(self, opt, args):
all_projects = self.GetProjects(args)
......@@ -182,18 +182,20 @@ the following meanings:
try:
os.chdir(self.manifest.topdir)
outstring = io.StringIO.StringIO()
outstring = io.StringIO()
self._FindOrphans(glob.glob('.*') + \
glob.glob('*'), \
proj_dirs, proj_dirs_parents, outstring)
if outstring.buflist:
if outstring.tell() > 0:
output = StatusColoring(self.manifest.globalConfig)
output.project('Objects not within a project (orphans)')
output.nl()
for entry in outstring.buflist:
output.untracked(entry)
output.nl()
outstring.seek(0)
lines = outstring.readlines()
for line in lines[0:len(lines)-1]:
output.untracked(line)
output.untracked(str.rstrip(lines[len(lines)-1]))
else:
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