diff --git a/pisi/__init__.py b/pisi/__init__.py index bb54e08a..20b6fc6b 100644 --- a/pisi/__init__.py +++ b/pisi/__init__.py @@ -12,7 +12,7 @@ # PiSi version -__version__ = "1.1_rc4" +__version__ = "1.1_rc5" __dbversion__ = "1.1_beta8" __filesdbversion__ = "1.0.5" # yes, this is the real bottleneck diff --git a/pisi/api.py b/pisi/api.py index ce150e8d..78ccb904 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -254,7 +254,7 @@ def configure_pending(): m.read(metadata_path) # FIXME: we need a full package info here! pkginfo.name = x - ctx.ui.notify(pisi.ui.configuring, name = pkginfo.name) + ctx.ui.notify(pisi.ui.configuring, package = pkginfo, files = None) pisi.comariface.post_install( pkginfo.name, m.package.providesComar, diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index b10eafde..55b77a12 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -93,7 +93,7 @@ class Install(AtomicOperation): self.files = self.package.files self.pkginfo = self.metadata.package - ctx.ui.notify(pisi.ui.installing, name=self.pkginfo.name) + ctx.ui.notify(pisi.ui.installing, package=self.pkginfo, files=self.files) def install(self, ask_reinstall = True): if ctx.get_option('fetch_only'): @@ -242,7 +242,7 @@ class Install(AtomicOperation): self.config_later = False if ctx.comar: import pisi.comariface - ctx.ui.notify(pisi.ui.configuring, name = self.pkginfo.name) + ctx.ui.notify(pisi.ui.configuring, package = self.pkginfo, files = self.files) pisi.comariface.post_install( self.pkginfo.name, self.metadata.package.providesComar, @@ -257,7 +257,7 @@ class Install(AtomicOperation): def extract_install(self): "unzip package in place" - ctx.ui.notify(pisi.ui.extracting, name = self.pkginfo.name) + ctx.ui.notify(pisi.ui.extracting, package = self.pkginfo, files = self.files) config_changed = [] def check_config_changed(config): @@ -405,7 +405,7 @@ class Remove(AtomicOperation): ctx.ui.warning(_('File list could not be read for package %s, continuing removal.') % package_name) self.files = Files() - ctx.ui.notify(pisi.ui.removing, name=self.package_name) + ctx.ui.notify(pisi.ui.removing, package = self.package, files = self.files) def run(self): """Remove a single package""" diff --git a/pisi/cli/__init__.py b/pisi/cli/__init__.py index 01e59b0b..f2d4dcbd 100644 --- a/pisi/cli/__init__.py +++ b/pisi/cli/__init__.py @@ -156,7 +156,7 @@ class CLI(UI): elif event == ui.configured: msg = _('Configured %s') % keywords['package'].name elif event == ui.extracting: - msg = _('Extracting the files of %s') % keywords['name'] + msg = _('Extracting the files of %s') % keywords['package'].name else: msg = None if msg: