MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

layerindex/tools/import_project.py: Code cleanup

Browse Source 
Remove ; and spaces when setting variables in calls.

Signed-off-by: Liam R. Howlett <Liam.Howlett@WindRiver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
This commit is contained in:
Liam R. Howlett 2016-11-04 11:10:22 -04:00 committed by Mark Hatle
parent a5e2f1e3b5
commit e0d163341e
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
layerindex/tools/import_project.py
View File

@ -30,10 +30,10 @@ class ImportProject:
logger = utils.logger_create('ProjectIndexImport') logger = utils.logger_create('ProjectIndexImport')
def find_layers(self, path): def find_layers(self, path):
self.logger.debug("finding layer.."); self.logger.debug("finding layer..")
result = [] result = []
for root, dirs, files in os.walk(path, followlinks=True): for root, _, files in os.walk(path, followlinks=True):
for name in fnmatch.filter(files, 'layer.conf'): for _ in fnmatch.filter(files, 'layer.conf'):
if not root.endswith('conf'): if not root.endswith('conf'):
continue continue
@ -44,14 +44,15 @@ class ImportProject:
def main(self): def main(self):
parser = optparse.OptionParser( parser = optparse.OptionParser(
usage = """ usage="""
%prog [options] [directory]""") %prog [options] [directory]""")
parser.add_option("-d", "--debug", parser.add_option("-d", "--debug",
help = "Enable debug output", help="Enable debug output",
action="store_const", const=logging.DEBUG, dest="loglevel", default=logging.INFO) action="store_const", const=logging.DEBUG,
dest="loglevel", default=logging.INFO)
parser.add_option("-n", "--dry-run", parser.add_option("-n", "--dry-run",
help = "Don't write any data back to the database", help="Don't write any data back to the database",
action="store_true", dest="dryrun") action="store_true", dest="dryrun")
self.options, args = parser.parse_args(sys.argv) self.options, args = parser.parse_args(sys.argv)
@ -59,7 +60,7 @@ class ImportProject:
self.logger.setLevel(self.options.loglevel) self.logger.setLevel(self.options.loglevel)
if len(args) == 1: if len(args) == 1:
print("Please provide a directory."); print("Please provide a directory.")
sys.exit(1) sys.exit(1)
install_dir = args[1] install_dir = args[1]
@ -74,7 +75,7 @@ class ImportProject:
self.add_layer(layer) self.add_layer(layer)
def add_layer(self, layer): def add_layer(self, layer):
self.logger.debug("Processing layer %s" % layer); self.logger.debug("Processing layer %s" % layer)
try: try:
git_dir = utils.runcmd("git rev-parse --show-toplevel", destdir=layer, logger=self.logger) git_dir = utils.runcmd("git rev-parse --show-toplevel", destdir=layer, logger=self.logger)
except Exception as e: except Exception as e:
@ -138,7 +139,7 @@ class ImportProject:
sys.argv = cmd sys.argv = cmd
if not self.options.dryrun: if not self.options.dryrun:
try: try:
import_layer.main(); import_layer.main()
except SystemExit as see: except SystemExit as see:
return see.code return see.code
return 0 return 0
@ -177,7 +178,7 @@ class ImportProject:
self.logger.info("update") self.logger.info("update")
if not self.options.dryrun: if not self.options.dryrun:
try: try:
update.main(); update.main()
except SystemExit: except SystemExit:
return 1 return 1