From cc31d82eb28e1cf637e83d7b3f01946727cfdfb3 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Wed, 30 Mar 2022 00:25:42 +0200 Subject: [PATCH] =?UTF-8?q?Trovato=20e=20fixato=20bug=20per=20cui=20basic?= =?UTF-8?q?=20sono=20pi=C3=B9=20grandi=20di=20standard.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- loaih/__init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/loaih/__init__.py b/loaih/__init__.py index 1fe8873..c25c045 100644 --- a/loaih/__init__.py +++ b/loaih/__init__.py @@ -205,14 +205,16 @@ class Build(object): # Let's process standard languages and append results to the # buildtarball if self.language == 'basic': - buildtarballs.extend([ x for x in self.tarballs[arch] if 'langpack_en-GB' in x]) if self.offline_help: - buildtarballs.extend([ x for x in self.tarballs[arch] if 'helppack_en-GB' in x ]) - if self.language == 'standard': + buildtarballs.extend([ x for x in self.tarballs[arch] if 'pack_en-GB' in x ]) + else: + buildtarballs.extend([ x for x in self.tarballs[arch] if 'langpack_en-GB' in x]) + elif self.language == 'standard': for lang in Build.LANGSTD: - buildtarballs.extend([ x for x in self.tarballs[arch] if ('langpack' + lang) in x ]) if self.offline_help: - buildtarballs.extend([ x for x in self.tarballs[arch] if ('helppack' + lang) in x ]) + buildtarballs.extend([ x for x in self.tarballs[arch] if ('pack' + lang) in x ]) + else: + buildtarballs.extend([ x for x in self.tarballs[arch] if ('langpack' + lang) in x ]) else: # In any other cases, we build with all languages if not self.offline_help: @@ -284,7 +286,7 @@ class Build(object): # Cleanup phase, before new run. for deb in glob.glob(self.appnamedir + '/*.deb'): os.remove(deb) - subprocess.run("find . -type d -maxdepth 1 -exec rm -rf {} \+", shell=True) + subprocess.run("find . -mindepth 1 -maxdepth 1 -type d -exec rm -rf {} \+", shell=True) def checksums(self): """Create checksums of the built versions."""