billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make cleanup optional.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-21 19:00:08 +00:00
parent c5a278729e
commit 04c3a81b9e
1 changed files with 41 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

76
ognibuild/dist.py
View file

@ -129,6 +129,13 @@ class DistCatcher(object):
self.find_files() self.find_files()
return False return False
def cleanup(self):
for path in self.files:
if os.path.isdir(path):
shutil.rmtree(path)
else:
os.unlink(path)
def create_dist( def create_dist(
session: Session, session: Session,
@ -137,47 +144,44 @@ def create_dist(
packaging_tree: Optional[Tree] = None, packaging_tree: Optional[Tree] = None,
include_controldir: bool = True, include_controldir: bool = True,
subdir: Optional[str] = None, subdir: Optional[str] = None,
cleanup: bool = False
) -> Optional[str]: ) -> Optional[str]:
from .buildsystem import detect_buildsystems from .buildsystem import detect_buildsystems
from .buildlog import InstallFixer from .buildlog import InstallFixer
if subdir is None: if subdir is None:
subdir = "package" subdir = "package"
with session: if packaging_tree is not None:
if packaging_tree is not None: from .debian import satisfy_build_deps
from .debian import satisfy_build_deps
satisfy_build_deps(session, packaging_tree) satisfy_build_deps(session, packaging_tree)
try: try:
export_directory, reldir = session.setup_from_vcs( export_directory, reldir = session.setup_from_vcs(
tree, include_controldir=include_controldir, subdir=subdir) tree, include_controldir=include_controldir, subdir=subdir)
except OSError as e: except OSError as e:
if e.errno == errno.ENOSPC: if e.errno == errno.ENOSPC:
raise DetailedFailure(1, ["mkdtemp"], NoSpaceOnDevice()) raise DetailedFailure(1, ["mkdtemp"], NoSpaceOnDevice())
raise raise
buildsystems = list(detect_buildsystems(export_directory)) buildsystems = list(detect_buildsystems(export_directory))
resolver = auto_resolver(session) resolver = auto_resolver(session)
fixers = [InstallFixer(resolver)] fixers = [InstallFixer(resolver)]
with DistCatcher(export_directory) as dc: with DistCatcher(export_directory) as dc:
session.chdir(reldir) session.chdir(reldir)
run_dist(session, buildsystems, resolver, fixers) run_dist(session, buildsystems, resolver, fixers)
try: try:
for path in dc.files: for path in dc.files:
shutil.copy(path, target_dir) shutil.copy(path, target_dir)
return os.path.join(target_dir, os.path.basename(path)) return os.path.join(target_dir, os.path.basename(path))
finally: finally:
for path in dc.files: if cleanup:
if os.path.isdir(path): dc.cleanup()
shutil.rmtree(path)
else:
os.unlink(path)
logging.info("No tarball created :(") logging.info("No tarball created :(")
raise DistNoTarball() raise DistNoTarball()
def create_dist_schroot( def create_dist_schroot(
@ -187,13 +191,15 @@ def create_dist_schroot(
packaging_tree: Optional[Tree] = None, packaging_tree: Optional[Tree] = None,
include_controldir: bool = True, include_controldir: bool = True,
subdir: Optional[str] = None, subdir: Optional[str] = None,
cleanup: bool = False
) -> Optional[str]: ) -> Optional[str]:
session = SchrootSession(chroot) with SchrootSession(chroot) as session:
return create_dist( return create_dist(
session, tree, target_dir, session, tree, target_dir,
packaging_tree=packaging_tree, packaging_tree=packaging_tree,
include_controldir=include_controldir, include_controldir=include_controldir,
subdir=subdir) subdir=subdir,
cleanup=cleanup)
if __name__ == "__main__": if __name__ == "__main__":