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

cleanup, and corrections for xdelta, now it works without problem

Browse Source
This commit is contained in:
S.Çağlar Onur
2006-03-16 16:18:28 +00:00
parent bc60d436dd
commit 0c790f0749
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/actionsapi/get.py
-3
View File
@@ -136,15 +136,12 @@ def defaultprefixDIR():
return dirs.defaultprefix return dirs.defaultprefix
def kdeDIR(): def kdeDIR():
# FIXME: Get followings from env.d or somewhere else
return dirs.kde return dirs.kde
def qtDIR(): def qtDIR():
# FIXME: Get followings from env.d or somewhere else
return dirs.qt return dirs.qt
def qtLIBDIR(): def qtLIBDIR():
# FIXME: Get followings from env.d or somewhere else
return '%s/lib/' % qtDIR() return '%s/lib/' % qtDIR()
# Binutils Variables # Binutils Variables
pisi/package.py
+8 -8
View File
@@ -72,19 +72,19 @@ class Package:
# FIXME: exists is not enough, also sha1sum check needed # FIXME: exists is not enough, also sha1sum check needed
# when implemented in pisi-index.xml # when implemented in pisi-index.xml
if not exists(self.filepath): if not exists(self.filepath):
fetch_url(url, dest, ctx.ui.Progress)
if installed and exists(current_fn): if installed and exists(current_fn):
# if package is installed and old pisi file exists, fetch xdelta # if package is installed and old pisi file exists, fetch xdelta
if not exists(xdelta_fn): if not exists(xdelta_fn):
ctx.ui.debug(_("Package xdelta URI: %s") % xdelta_url) ctx.ui.info(_("Trying to fetch xdelta: %s") % xdelta_url)
try: try:
fetch_url(xdelta_url, dest, ctx.ui.Progress) fetch_url(xdelta_url, dest, ctx.ui.Progress)
except FetchError: except FetchError,e:
pass ctx.ui.error(_('XDelta %s: not exists') % xdelta_url)
# generate new one using old pisi file and xdelta else:
# baris: but why do we generate this here? # generate new one using old pisi file and xdelta
util.generate_pisi_file(xdelta_fn, current_fn, self.filepath) # baris: but why do we generate this here?
util.generate_pisi_file(xdelta_fn, current_fn, self.filepath)
fetch_url(url, dest, ctx.ui.Progress)
else: else:
ctx.ui.info(_('%s [cached]') % url.filename()) ctx.ui.info(_('%s [cached]') % url.filename())