[elbe-devel] [PATCH v2 02/24] db: use same codingstyle for all files to add
Manuel Traut
manut at linutronix.de
Thu Feb 8 14:16:48 CET 2018
The auto pep8 coding style formatter limitted the line size to 80.
The same function is called multiple times here. Use the same line-break
style for all calls to ease readability.
Signed-off-by: Manuel Traut <manut at linutronix.de>
Reviewed-by: Torben Hohn <torben.hohn at linutronix.de>
---
elbepack/db.py | 83 +++++++++++++++++++++++++---------------------------------
1 file changed, 35 insertions(+), 48 deletions(-)
diff --git a/elbepack/db.py b/elbepack/db.py
index 49bbefcd..4d7ea9ff 100644
--- a/elbepack/db.py
+++ b/elbepack/db.py
@@ -811,66 +811,53 @@ class ElbeDB(object):
"application/octet-stream", "Image")
# Add other generated files
- self._update_project_file(
- s,
- p.builddir,
- "source.xml",
- "application/xml",
- "Current source.xml of the project")
- self._update_project_file(
- s,
- p.builddir,
- "licence.txt",
- "text/plain; charset=utf-8",
- "License file")
+ self._update_project_file(s, p.builddir, "source.xml",
+ "application/xml",
+ "Current source.xml of the project")
+
+ self._update_project_file(s, p.builddir, "licence.txt",
+ "text/plain; charset=utf-8",
+ "License file")
+
self._update_project_file(s, p.builddir, "licence.xml",
- "application/xml", "xml License file")
- self._update_project_file(
- s,
- p.builddir,
- "validation.txt",
- "text/plain; charset=utf-8",
- "Package list validation result")
+ "application/xml",
+ "xml License file")
+
+ self._update_project_file(s, p.builddir, "validation.txt",
+ "text/plain; charset=utf-8",
+ "Package list validation result")
+
self._update_project_file(s, p.builddir, "elbe-report.txt",
- "text/plain; charset=utf-8", "Report")
+ "text/plain; charset=utf-8",
+ "Report")
+
self._update_project_file(s, p.builddir, "log.txt",
- "text/plain; charset=utf-8", "Log file")
- self._update_project_file(
- s,
- p.builddir,
- "sysroot.tar.xz",
- "application/x-xz-compressed-tar",
- "sysroot for cross-toolchains")
- self._update_project_file(
- s,
- p.builddir,
- "chroot.tar.xz",
- "application/x-xz-compressed-tar",
- "chroot for 'native' development")
+ "text/plain; charset=utf-8",
+ "Log file")
+
+ self._update_project_file(s, p.builddir, "sysroot.tar.xz",
+ "application/x-xz-compressed-tar",
+ "sysroot for cross-toolchains")
+
+ self._update_project_file(s, p.builddir, "chroot.tar.xz",
+ "application/x-xz-compressed-tar",
+ "chroot for 'native' development")
# Add Repository iso images
for img in ep.repo_images:
name = os.path.basename(img)
- self._update_project_file(
- s,
- p.builddir,
- name,
- "application/octet-stream",
- "Repository IsoImage")
+ self._update_project_file(s, p.builddir, name,
+ "application/octet-stream",
+ "Repository IsoImage")
# Scan pbuilder/build directory if that exists
pbresult_path = os.path.join(p.builddir, "pbuilder", "result")
if os.path.isdir(pbresult_path):
for f in os.listdir(pbresult_path):
- self._update_project_file(
- s,
- p.builddir,
- os.path.join(
- "pbuilder",
- "result",
- f),
- "application/octet-stream",
- "Pbuilder artifact")
+ pfile = os.path.join("pbuilder", "result", f)
+ self._update_project_file(s, p.builddir, pfile
+ "application/octet-stream",
+ "Pbuilder artifact")
def _update_project_file(self, s, builddir, name, mime_type, description):
filename = os.path.join(builddir, name)
--
2.15.1
More information about the elbe-devel
mailing list