Trovato e fixato bug per cui basic sono più grandi di standard.

This commit is contained in:
Emiliano Vavassori 2022-03-30 00:25:42 +02:00
parent 8c630cbc56
commit cc31d82eb2
1 changed files with 8 additions and 6 deletions

View File

@ -205,14 +205,16 @@ class Build(object):
# Let's process standard languages and append results to the # Let's process standard languages and append results to the
# buildtarball # buildtarball
if self.language == 'basic': if self.language == 'basic':
buildtarballs.extend([ x for x in self.tarballs[arch] if 'langpack_en-GB' in x])
if self.offline_help: if self.offline_help:
buildtarballs.extend([ x for x in self.tarballs[arch] if 'helppack_en-GB' in x ]) buildtarballs.extend([ x for x in self.tarballs[arch] if 'pack_en-GB' in x ])
if self.language == 'standard': 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: for lang in Build.LANGSTD:
buildtarballs.extend([ x for x in self.tarballs[arch] if ('langpack' + lang) in x ])
if self.offline_help: 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: else:
# In any other cases, we build with all languages # In any other cases, we build with all languages
if not self.offline_help: if not self.offline_help:
@ -284,7 +286,7 @@ class Build(object):
# Cleanup phase, before new run. # Cleanup phase, before new run.
for deb in glob.glob(self.appnamedir + '/*.deb'): for deb in glob.glob(self.appnamedir + '/*.deb'):
os.remove(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): def checksums(self):
"""Create checksums of the built versions.""" """Create checksums of the built versions."""