diff --git a/pisi/archive.py b/pisi/archive.py index fbc1e4e7..9585b7f4 100644 --- a/pisi/archive.py +++ b/pisi/archive.py @@ -2,7 +2,7 @@ # Archive module provides access to regular archive file types. # maintainer baris and meren -#standart lisbrary modules +#standard lisbrary modules import os import sys import tarfile @@ -73,12 +73,12 @@ class ArchiveZip(ArchiveBase): """Close the zip archive.""" self.zip.close() - def add_file(self, fileName): + def add_to_archive(self, fileName): """Add file or directory to a zip file""" if os.path.isdir(fileName) and not os.path.islink(fileName): self.zip.writestr(fileName + '/', '') for f in os.listdir(fileName): - self.add_file(fileName + '/' + f) + self.add_to_archive(fileName + '/' + f) else: if os.path.islink(fileName): dest = os.readlink(fileName) diff --git a/pisi/build.py b/pisi/build.py index 27cc7c45..78fcb773 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -200,8 +200,8 @@ class PisiBuild: c = os.getcwd() os.chdir(self.ctx.pkg_dir()) - pkg.add_file(const.metadata_xml) - pkg.add_file(const.files_xml) - pkg.add_file("install") + pkg.add_to_package(const.metadata_xml) + pkg.add_to_package(const.files_xml) + pkg.add_to_package("install") pkg.close() os.chdir(c) diff --git a/pisi/package.py b/pisi/package.py index 7a4354de..badad2c5 100644 --- a/pisi/package.py +++ b/pisi/package.py @@ -13,9 +13,9 @@ class Package: self.impl = archive.ArchiveZip(packagefn, 'zip', mode) self.filename = packagefn - def add_file(self, fn): + def add_to_package(self, fn): """Add a file or directory to package""" - self.impl.add_file(fn) + self.impl.add_to_archive(fn) def close(self): """Close the package archive"""