From c48d6d8b507ae549071eabb33b67d42fc9258d87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 16 Mar 2006 16:25:40 +0000 Subject: [PATCH] =?UTF-8?q?d=C3=BCzg=C3=BCn=20hali?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/package.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pisi/package.py b/pisi/package.py index 18d1f8ff..027c8c43 100644 --- a/pisi/package.py +++ b/pisi/package.py @@ -69,21 +69,23 @@ class Package: else: installed = False + if installed and exists(current_fn): + # if package is installed and old pisi file exists, fetch xdelta + if not exists(xdelta_fn): + ctx.ui.info(_("Trying to fetch xdelta: %s") % xdelta_url) + try: + fetch_url(xdelta_url, dest, ctx.ui.Progress) + except FetchError,e: + ctx.ui.error(_('XDelta %s: not exists') % xdelta_url) + else: + # generate new one using old pisi file and xdelta + util.generate_pisi_file(xdelta_fn, current_fn, self.filepath) + else: + util.generate_pisi_file(xdelta_fn, current_fn, self.filepath) + # FIXME: exists is not enough, also sha1sum check needed # when implemented in pisi-index.xml if not exists(self.filepath): - if installed and exists(current_fn): - # if package is installed and old pisi file exists, fetch xdelta - if not exists(xdelta_fn): - ctx.ui.info(_("Trying to fetch xdelta: %s") % xdelta_url) - try: - fetch_url(xdelta_url, dest, ctx.ui.Progress) - except FetchError,e: - ctx.ui.error(_('XDelta %s: not exists') % xdelta_url) - else: - # generate new one using old pisi file and xdelta - # 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: ctx.ui.info(_('%s [cached]') % url.filename())