Skip to content
Snippets Groups Projects
Commit d1ae3f2e authored by Simon McVittie's avatar Simon McVittie
Browse files

Fix various linter warnings

parent 56289297
No related branches found
No related tags found
No related merge requests found
...@@ -351,7 +351,8 @@ def main(): ...@@ -351,7 +351,8 @@ def main():
installed_binaries = set() # type: typing.Set[str] installed_binaries = set() # type: typing.Set[str]
for package, source in ( for package, source in (
list(DEPENDENCIES.items()) + list(PRIMARY_ARCH_DEPENDENCIES.items()) list(DEPENDENCIES.items())
+ list(PRIMARY_ARCH_DEPENDENCIES.items())
): ):
if os.path.exists('/usr/share/doc/{}/copyright'.format(package)): if os.path.exists('/usr/share/doc/{}/copyright'.format(package)):
installed_binaries.add(package) installed_binaries.add(package)
...@@ -373,7 +374,8 @@ def main(): ...@@ -373,7 +374,8 @@ def main():
package, package,
], universal_newlines=True).splitlines() ], universal_newlines=True).splitlines()
): ):
source_to_download.add(re.sub(r'[+]srt[0-9a-z.]+$', '', expr)) source_to_download.add(
re.sub(r'[+]srt[0-9a-z.]+$', '', expr))
else: else:
install( install(
'{}/build-relocatable/usr/share/doc/{}/copyright'.format( '{}/build-relocatable/usr/share/doc/{}/copyright'.format(
...@@ -398,7 +400,8 @@ def main(): ...@@ -398,7 +400,8 @@ def main():
'dpkg-query', 'dpkg-query',
'-W', '-W',
'-f', '-f',
r'${binary:Package}\t${Version}\t${Source}\t${Installed-Size}\n', (r'${binary:Package}\t${Version}\t'
r'${Source}\t${Installed-Size}\n'),
] + sorted(installed_binaries), stdout=writer) ] + sorted(installed_binaries), stdout=writer)
with open( with open(
......
...@@ -64,7 +64,6 @@ class Gui: ...@@ -64,7 +64,6 @@ class Gui:
os.path.join(source_of_runtimes, member) os.path.join(source_of_runtimes, member)
) )
files = os.path.join(path, 'files') files = os.path.join(path, 'files')
metadata = os.path.join(path, 'metadata')
if os.path.isdir(files): if os.path.isdir(files):
description = self._describe_runtime(path) description = self._describe_runtime(path)
...@@ -180,6 +179,7 @@ class Gui: ...@@ -180,6 +179,7 @@ class Gui:
except GLib.Error: except GLib.Error:
pass pass
else: else:
assert name is not None
variant = name.split('.')[-1] variant = name.split('.')[-1]
except GLib.Error: except GLib.Error:
pass pass
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import argparse import argparse
import json
import os import os
import subprocess import subprocess
import sys import sys
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment