Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Size variables should be long.

Browse Source
This commit is contained in:
Bahadır Kandemir
2009-11-22 14:56:51 +00:00
parent 175b3ce19c
commit d2e28e0bd5
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4
View File
@@ -1,3 +1,7 @@
2009-11-22 Bahadır Kandemir <bahadir@pardus.org.tr>
* pisi/operations/build.py, pisi/index.py: *Size variables should be
long, instead of int.
2009-11-09 Faik Uygur <faik@pardus.org.tr> 2009-11-09 Faik Uygur <faik@pardus.org.tr>
* pisi/actionsapi/perlmodules.py: KeepSpecial should control pod file removal. * pisi/actionsapi/perlmodules.py: KeepSpecial should control pod file removal.
Remove .packlist files from perl packages. Remove .packlist files from perl packages.
pisi/index.py
+2 -2
View File
@@ -118,7 +118,7 @@ class Index(xmlfile.XmlFile):
def add_package(self, path, deltas, repo_uri): def add_package(self, path, deltas, repo_uri):
package = pisi.package.Package(path, 'r') package = pisi.package.Package(path, 'r')
md = package.get_metadata() md = package.get_metadata()
md.package.packageSize = os.path.getsize(path) md.package.packageSize = long(os.path.getsize(path))
md.package.packageHash = util.sha1_file(path) md.package.packageHash = util.sha1_file(path)
if ctx.config.options and ctx.config.options.absolute_urls: if ctx.config.options and ctx.config.options.absolute_urls:
md.package.packageURI = os.path.realpath(path) md.package.packageURI = os.path.realpath(path)
@@ -140,7 +140,7 @@ class Index(xmlfile.XmlFile):
for delta_path in deltas[md.package.name]: for delta_path in deltas[md.package.name]:
delta = metadata.Delta() delta = metadata.Delta()
delta.packageURI = util.removepathprefix(repo_uri, delta_path) delta.packageURI = util.removepathprefix(repo_uri, delta_path)
delta.packageSize = os.path.getsize(delta_path) delta.packageSize = long(os.path.getsize(delta_path))
delta.packageHash = util.sha1_file(delta_path) delta.packageHash = util.sha1_file(delta_path)
name, buildFrom, buildTo = util.parse_delta_package_name(delta_path) name, buildFrom, buildTo = util.parse_delta_package_name(delta_path)
delta.buildFrom = buildFrom delta.buildFrom = buildFrom
pisi/operations/build.py
+2 -2
View File
@@ -676,7 +676,7 @@ class Builder:
for fileinfo in self.files.list: for fileinfo in self.files.list:
size += fileinfo.size size += fileinfo.size
metadata.package.installedSize = size metadata.package.installedSize = long(size)
self.metadata = metadata self.metadata = metadata
@@ -712,7 +712,7 @@ class Builder:
continue continue
frpath = pisi.util.removepathprefix(install_dir, fpath) # relative path frpath = pisi.util.removepathprefix(install_dir, fpath) # relative path
ftype, permanent = get_file_type(frpath, package.files, install_dir) ftype, permanent = get_file_type(frpath, package.files, install_dir)
fsize = pisi.util.dir_size(fpath) fsize = long(pisi.util.dir_size(fpath))
if not os.path.islink(fpath): if not os.path.islink(fpath):
st = os.stat(fpath) st = os.stat(fpath)
else: else: