[Python-apps-commits] r14565 - in packages/bundlewrap/trunk (7 files)

[jcc at users.alioth.debian.org]

    Date: Tuesday, January 9, 2018 @ 12:12:02
  Author: jcc
Revision: 14565

Upstream version 3.2.1

Modified:
  packages/bundlewrap/trunk/CHANGELOG.md
  packages/bundlewrap/trunk/bundlewrap/__init__.py
  packages/bundlewrap/trunk/bundlewrap/cmdline/metadata.py
  packages/bundlewrap/trunk/bundlewrap/items/actions.py
  packages/bundlewrap/trunk/bundlewrap/items/pkg_openbsd.py
  packages/bundlewrap/trunk/debian/changelog
  packages/bundlewrap/trunk/setup.py

Modified: packages/bundlewrap/trunk/CHANGELOG.md
===================================================================
--- packages/bundlewrap/trunk/CHANGELOG.md	2018-01-08 08:30:55 UTC (rev 14564)
+++ packages/bundlewrap/trunk/CHANGELOG.md	2018-01-09 12:12:02 UTC (rev 14565)
@@ -1,3 +1,12 @@
+# 3.2.1
+
+2018-01-08
+
+* fixed metadata key filter for `bw metadata --blame`
+* fixed pkg_openbsd reported incorrectly as having having wrong flavor installed
+* fixed crash when declining actions interactively
+
+
 # 3.2.0
 
 2018-01-01

Modified: packages/bundlewrap/trunk/bundlewrap/__init__.py
===================================================================
--- packages/bundlewrap/trunk/bundlewrap/__init__.py	2018-01-08 08:30:55 UTC (rev 14564)
+++ packages/bundlewrap/trunk/bundlewrap/__init__.py	2018-01-09 12:12:02 UTC (rev 14565)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-VERSION = (3, 2, 0)
+VERSION = (3, 2, 1)
 VERSION_STRING = ".".join([str(v) for v in VERSION])

Modified: packages/bundlewrap/trunk/bundlewrap/cmdline/metadata.py
===================================================================
--- packages/bundlewrap/trunk/bundlewrap/cmdline/metadata.py	2018-01-08 08:30:55 UTC (rev 14564)
+++ packages/bundlewrap/trunk/bundlewrap/cmdline/metadata.py	2018-01-09 12:12:02 UTC (rev 14565)
@@ -41,9 +41,14 @@
     else:
         node = get_node(repo, args['target'], adhoc_nodes=args['adhoc_nodes'])
         if args['blame']:
+            key_paths = [path.strip() for path in " ".join(args['keys']).split(",")]
             table = [[bold(_("path")), bold(_("source"))], ROW_SEPARATOR]
             for path, blamed in sorted(node.metadata_blame.items()):
-                table.append([" ".join(path), ", ".join(blamed)])
+                joined_path = " ".join(path)
+                for key_path in key_paths:
+                    if joined_path.startswith(key_path):
+                        table.append([joined_path, ", ".join(blamed)])
+                        break
             page_lines(render_table(table))
         else:
             for line in dumps(

Modified: packages/bundlewrap/trunk/bundlewrap/items/actions.py
===================================================================
--- packages/bundlewrap/trunk/bundlewrap/items/actions.py	2018-01-08 08:30:55 UTC (rev 14564)
+++ packages/bundlewrap/trunk/bundlewrap/items/actions.py	2018-01-09 12:12:02 UTC (rev 14565)
@@ -126,7 +126,7 @@
                 ),
             )
         ):
-            return (self.STATUS_SKIPPED, [_("interactive")])
+            return (self.STATUS_SKIPPED, self.SKIP_REASON_INTERACTIVE)
         try:
             self.run()
             return (self.STATUS_ACTION_SUCCEEDED, None)

Modified: packages/bundlewrap/trunk/bundlewrap/items/pkg_openbsd.py
===================================================================
--- packages/bundlewrap/trunk/bundlewrap/items/pkg_openbsd.py	2018-01-08 08:30:55 UTC (rev 14564)
+++ packages/bundlewrap/trunk/bundlewrap/items/pkg_openbsd.py	2018-01-09 12:12:02 UTC (rev 14565)
@@ -99,7 +99,7 @@
         version, flavor = pkg_installed(self.node, self.name)
         return {
             'installed': bool(version),
-            'flavor': flavor if flavor else _("none"),
+            'flavor': flavor if flavor is not None else _("none"),
             'version': version if version else _("none"),
         }
 

Modified: packages/bundlewrap/trunk/debian/changelog
===================================================================
--- packages/bundlewrap/trunk/debian/changelog	2018-01-08 08:30:55 UTC (rev 14564)
+++ packages/bundlewrap/trunk/debian/changelog	2018-01-09 12:12:02 UTC (rev 14565)
@@ -1,3 +1,9 @@
+bundlewrap (3.2.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Carter <jcc at debian.org>  Tue, 09 Jan 2018 08:17:19 +0200
+
 bundlewrap (3.2.0-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/bundlewrap/trunk/setup.py
===================================================================
--- packages/bundlewrap/trunk/setup.py	2018-01-08 08:30:55 UTC (rev 14564)
+++ packages/bundlewrap/trunk/setup.py	2018-01-09 12:12:02 UTC (rev 14565)
@@ -16,7 +16,7 @@
 
 setup(
     name="bundlewrap",
-    version="3.2.0",
+    version="3.2.1",
     description="Config management with Python",
     long_description=(
         "By allowing for easy and low-overhead config management, BundleWrap fills the gap between complex deployments using Chef or Puppet and old school system administration over SSH.\n"