From 4971b3aeaca2c89d29903848142068dc736918f3 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 14 Nov 2005 23:25:28 +0000 Subject: [PATCH] =?UTF-8?q?*=20Mesaj=20yan=C4=B1lt=C4=B1c=C4=B1yd=C4=B1.?= =?UTF-8?q?=20/var/lib/pisi=20gezilirken=20bir=20paket=20kurulup=20=20=20d?= =?UTF-8?q?aha=20sonra=20ayn=C4=B1=20paketin=20farkl=C4=B1=20versiyonuna?= =?UTF-8?q?=20rastlan=C4=B1nca=20sadece=20=C3=BCst=20=20=20versiyon=20ise?= =?UTF-8?q?=20=C3=B6nceki=20kald=C4=B1r=C4=B1l=C4=B1p=20yenisi=20kuruluyor?= =?UTF-8?q?,=20alt=20versiyon=20ise=20=20=20pas=20ge=C3=A7iliyor.=20(#764)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/atomicoperations.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index e1dedce3..edcd8f54 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -439,8 +439,18 @@ def resurrect_package(package_fn): if errs: util.Checks.print_errors(errs) raise Error, _("MetaData format wrong (%s)") % package_fn + + # FIXME: there won't be any previous versions of the same package under /var/lib/pisi + # therefore there won't be any need for this check and __is_virtual_upgrade function + # this is just for backward compatibility for sometime + + # yes, this is an ugly hack + passed = False + if ctx.installdb.is_installed(metadata.package.name): + passed = True - ctx.ui.info(_('* Adding \'%s\' to db... ') % (metadata.package.name), noln=True) + if not passed: + ctx.ui.info(_('* Adding \'%s\' to db... ') % (metadata.package.name), noln=True) files_xml = util.join_path(ctx.config.lib_dir(), package_fn, ctx.const.files_xml) if not exists(files_xml): @@ -454,4 +464,5 @@ def resurrect_package(package_fn): import pisi.atomicoperations pisi.atomicoperations.virtual_install(metadata, files) - ctx.ui.info(_('OK.')) + if not passed: + ctx.ui.info(_('OK.'))