From 8415a8b92edeae4ac834f286c2d61f52868f3cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Wed, 31 May 2006 06:51:52 +0000 Subject: [PATCH] fix: use new package format by default, even when not using cli... --- pisi/build.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index 28e5c453..239a52de 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -806,7 +806,14 @@ class Builder: files = Files() files.read(ctx.const.files_xml) - if ctx.get_option('package_format') == "1.1": + if ctx.get_option('package_format') == "1.0": + for finfo in files.list: + orgname = arcname = join("install", finfo.path) + if package.debug_package: + orgname = join("debug", finfo.path) + pkg.add_to_package(orgname, arcname) + pkg.close() + else: # default package format is 1.1, so make it fallback. tar = archive.ArchiveTar("install.tar.lzma", "tarlzma") for finfo in files.list: orgname = arcname = join("install", finfo.path) @@ -818,13 +825,6 @@ class Builder: pkg.close() os.unlink("install.tar") os.unlink("install.tar.lzma") - else: - for finfo in files.list: - orgname = arcname = join("install", finfo.path) - if package.debug_package: - orgname = join("debug", finfo.path) - pkg.add_to_package(orgname, arcname) - pkg.close() os.chdir(c) self.set_state("buildpackages")