diff --git a/pisi/operations/build.py b/pisi/operations/build.py index b5e359bc..113b9df8 100644 --- a/pisi/operations/build.py +++ b/pisi/operations/build.py @@ -1005,16 +1005,16 @@ class Builder: if not package.icon: package.icon = self.spec.source.icon - ctx.ui.action(_("** Building package %s") % package.name); - - ctx.ui.info(_("Generating %s,") % ctx.const.files_xml) self.gen_files_xml(package) if not self.files.list: - ctx.ui.warning(_("Ignoring empty package %s" % package.name)) + if not package.debug_package: + ctx.ui.warning(_("Ignoring empty package %s" \ + % package.name)) continue - ctx.ui.info(_("Generating %s,") % ctx.const.metadata_xml) + ctx.ui.action(_("Building package %s") % package.name) + self.gen_metadata_xml(package) self.metadata.write(util.join_path(self.pkg_dir(), ctx.const.metadata_xml)) @@ -1025,12 +1025,14 @@ class Builder: if outdir: name = util.join_path(outdir, name) + name = os.path.normpath(name) + if package.debug_package: self.new_debug_packages.append(name) else: self.new_packages.append(name) - ctx.ui.info(_("Creating PiSi package %s.") % name) + ctx.ui.info(_("Creating %s") % name) pkg = pisi.package.Package(name, "w", format=self.target_package_format, @@ -1070,7 +1072,6 @@ class Builder: pkg.close() self.set_state("buildpackages") - ctx.ui.info(_("Done.")) ctx.ui.info(_("All of the files under the install dir (%s) has been " "collected by package(s)") % install_dir) diff --git a/pisi/operations/delta.py b/pisi/operations/delta.py index bf71e6c6..c9aa869d 100644 --- a/pisi/operations/delta.py +++ b/pisi/operations/delta.py @@ -47,7 +47,7 @@ def create_delta_packages_from_obj(old_packages, new_package_obj, specdir): new_distro_id, new_arch)) + ctx.const.delta_package_suffix - ctx.ui.info(_("Creating %s...") % delta_name) + ctx.ui.info(_("Creating %s") % delta_name) if out_dir: delta_name = util.join_path(out_dir, delta_name) @@ -145,7 +145,7 @@ def create_delta_packages(old_packages, new_package): new_distro_id, new_arch)) + ctx.const.delta_package_suffix - ctx.ui.info(_("Creating %s...") % delta_name) + ctx.ui.info(_("Creating %s") % delta_name) if out_dir: delta_name = util.join_path(out_dir, delta_name)