From 3ee92e59d1dceb0a43bde6308ba3dc1f67d0a3bf Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Dec 01 2019 08:06:14 +0000 Subject: Fix warning about bad spec file name when running in directory Also, operate on the given spec file, when given a spec file argument, not a directory name. --- diff --git a/depython2ize.py b/depython2ize.py index 5993b09..48520da 100755 --- a/depython2ize.py +++ b/depython2ize.py @@ -181,9 +181,9 @@ def remove_sections(package, lines): for dirname in opts.dirname: if dirname.name.endswith('.spec'): - dirname = dirname.parent - - specfile, = dirname.glob('*.spec') + specfile, dirname = dirname, dirname.parent + else: + specfile, = dirname.glob('*.spec') print(f'==== {specfile}') try: @@ -200,8 +200,8 @@ for dirname in opts.dirname: pass name = dirname.name - if name != specfile.stem: - print('BAD SPEC FILE NAME') + if name and name != specfile.stem: + print(f'BAD SPEC FILE NAME ({name!r} != {specfile.stem!r})') with open(specfile, 'rt') as f: lines = f.readlines() diff --git a/renamer.py b/renamer.py index b8eac26..5e2b3f9 100755 --- a/renamer.py +++ b/renamer.py @@ -133,9 +133,9 @@ for dirname in opts.dirname: continue if dirname.name.endswith('.spec'): - dirname = dirname.parent - - specfile, = dirname.glob('*.spec') + specfile, dirname = dirname, dirname.parent + else: + specfile, = dirname.glob('*.spec') print(f'==== {specfile}') new = pathlib.Path(f'{specfile}.tmp') @@ -146,7 +146,7 @@ for dirname in opts.dirname: pass name = dirname.name - if name != specfile.stem: + if name and name != specfile.stem: print('BAD SPEC FILE NAME') if not opts.no_blacklist and name in BLACKLIST: