From 56dc21fd4b75a4a91fdd0b86234e1148fe46c8dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Wed, 22 Jun 2005 11:37:15 +0000 Subject: [PATCH] constants are Constants --- pisi/build.py | 12 ++++++------ pisi/context.py | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index 5fc2a6a6..5f9a4776 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -176,7 +176,7 @@ class PisiBuild: elt.appendChild(update) metadata.appendElement(elt) - metadata.write(os.path.join(self.ctx.pkg_dir(),"metadata.xml")) + metadata.write(os.path.join(self.ctx.pkg_dir(), self.ctx.const.metadata_xml)) def genFilesXml(self, package): """Generetes files.xml using the path definitions in specfile and @@ -200,17 +200,17 @@ class PisiBuild: depth = len(path.pathname) ftype = path.fileType files.append(FileInfo(fpath, ftype, fhash)) - files.write(os.path.join(self.ctx.pkg_dir(),"files.xml")) + files.write(os.path.join(self.ctx.pkg_dir(), self.ctx.const.files_xml)) def buildPackages(self): for package in self.spec.packages: ui.info("** Building package %s\n" % package.name); - ui.info("Generating metadata.xml...") + ui.info("Generating %s..." % self.ctx.const.metadata_xml) self.genMetaDataXml(package) ui.info(" done.\n") - ui.info("Generating files.xml...") + ui.info("Generating %s..." % self.ctx.const.files_xml) self.genFilesXml(package) ui.info(" done.\n") @@ -222,7 +222,7 @@ class PisiBuild: c = os.getcwd() os.chdir(self.ctx.pkg_dir()) - pkg.add_file("files.xml") - pkg.add_file("metadata.xml") + pkg.add_file(self.ctx.const.files_xml) + pkg.add_file(self.ctx.const.files_xml) pkg.close() os.chdir(c) diff --git a/pisi/context.py b/pisi/context.py index 6ca3c141..63338f28 100644 --- a/pisi/context.py +++ b/pisi/context.py @@ -27,6 +27,8 @@ class Constants: # file/directory names self.c.actions_file = "actions.py" self.c.files_dir = "files" + self.c.files_xml = "files.xml" + self.c.metadata_xml = "metadata.xml" # functions in actions_file self.c.setup_func = "setup"