diff --git a/python/LbNightlyTools/Scripts/Index.py b/python/LbNightlyTools/Scripts/Index.py index ecb77be65ff90820226fa047acb498c3ebf65dab..ede433880d8b855499ba57d13b009940295e0fd0 100644 --- a/python/LbNightlyTools/Scripts/Index.py +++ b/python/LbNightlyTools/Scripts/Index.py @@ -164,14 +164,19 @@ class Script(BaseScript): ensureDirs([index_dir]) glimpseindex = Popen(['glimpseindex', '-H', index_dir, '-F'], - cwd=proj_root, - stdin=PIPE, - stdout=glimpse_stdout) + cwd=proj_root, + stdin=PIPE, + stdout=glimpse_stdout) for f in filesToIndex(proj_root): glimpseindex.stdin.write(f + '\n') glimpseindex.stdin.close() glimpseindex.wait() + self.log.debug('fixing indexes permissions') + for dirpath, _, filenames in os.walk(index_dir): + os.chmod(dirpath, 0755) + for filename in filenames: + os.chmod(filename, 0644) self.log.info('packing indexes for %s...', proj) pack([proj.baseDir], join(self.artifacts_dir, self.packname(proj)), cwd=indexes_dir, checksum='md5') diff --git a/python/LbNightlyTools/Utils.py b/python/LbNightlyTools/Utils.py index 41cdde249ef49aa7b85ca176dd270fb1c4c8a766..15355aa81e4fcd96fd5318686aa1883c80b9b0bc 100644 --- a/python/LbNightlyTools/Utils.py +++ b/python/LbNightlyTools/Utils.py @@ -596,7 +596,7 @@ class Dashboard(object): for r in self.db.iterview(viewname, batch=100, **opts): v = r[u'value'] if returnAll: - yield(v) + yield v else: yield (r[u'key'], v[u'slot'], v[u'build_id'])