[Python-apps-commits] r14096 - in packages/bundlewrap/trunk (6 files)

[highvoltage-guest at users.alioth.debian.org]

    Date: Monday, June 5, 2017 @ 19:24:17
  Author: highvoltage-guest
Revision: 14096

New upstream version 2.8.1

Modified:
  packages/bundlewrap/trunk/CHANGELOG.md
  packages/bundlewrap/trunk/bundlewrap/__init__.py
  packages/bundlewrap/trunk/bundlewrap/items/actions.py
  packages/bundlewrap/trunk/debian/changelog
  packages/bundlewrap/trunk/docs/content/repo/hooks.md
  packages/bundlewrap/trunk/setup.py

Modified: packages/bundlewrap/trunk/CHANGELOG.md
===================================================================
--- packages/bundlewrap/trunk/CHANGELOG.md	2017-06-05 01:10:12 UTC (rev 14095)
+++ packages/bundlewrap/trunk/CHANGELOG.md	2017-06-05 19:24:17 UTC (rev 14096)
@@ -1,3 +1,10 @@
+# 2.18.1
+
+2017-06-01
+
+* fixed display of comments for actions
+
+
 # 2.18.0
 
 2017-05-22

Modified: packages/bundlewrap/trunk/bundlewrap/__init__.py
===================================================================
--- packages/bundlewrap/trunk/bundlewrap/__init__.py	2017-06-05 01:10:12 UTC (rev 14095)
+++ packages/bundlewrap/trunk/bundlewrap/__init__.py	2017-06-05 19:24:17 UTC (rev 14096)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-VERSION = (2, 18, 0)
+VERSION = (2, 18, 1)
 VERSION_STRING = ".".join([str(v) for v in VERSION])

Modified: packages/bundlewrap/trunk/bundlewrap/items/actions.py
===================================================================
--- packages/bundlewrap/trunk/bundlewrap/items/actions.py	2017-06-05 01:10:12 UTC (rev 14095)
+++ packages/bundlewrap/trunk/bundlewrap/items/actions.py	2017-06-05 19:24:17 UTC (rev 14096)
@@ -4,7 +4,7 @@
 from datetime import datetime
 
 from bundlewrap.exceptions import ActionFailure, BundleError
-from bundlewrap.items import Item
+from bundlewrap.items import format_comment, Item
 from bundlewrap.utils.ui import io
 from bundlewrap.utils.text import mark_for_translation as _
 from bundlewrap.utils.text import blue, bold, wrap_question
@@ -68,13 +68,17 @@
                 ))
                 return (self.STATUS_SKIPPED, ["unless"])
 
+        question_body = self.attributes['command']
+        if self.comment:
+            question_body += format_comment(self.comment)
+
         if (
             interactive and
             self.attributes['interactive'] is not False and
             not io.ask(
                 wrap_question(
                     self.id,
-                    self.attributes['command'],
+                    question_body,
                     _("Run action {}?").format(
                         bold(self.name),
                     ),

Modified: packages/bundlewrap/trunk/debian/changelog
===================================================================
--- packages/bundlewrap/trunk/debian/changelog	2017-06-05 01:10:12 UTC (rev 14095)
+++ packages/bundlewrap/trunk/debian/changelog	2017-06-05 19:24:17 UTC (rev 14096)
@@ -1,3 +1,9 @@
+bundlewrap (2.18.1-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Carter <jcarter at linux.com>  Mon, 05 Jun 2017 21:19:31 +0200
+
 bundlewrap (2.18.0-1) experimental; urgency=medium
 
   * New upstream release

Modified: packages/bundlewrap/trunk/docs/content/repo/hooks.md
===================================================================
--- packages/bundlewrap/trunk/docs/content/repo/hooks.md	2017-06-05 01:10:12 UTC (rev 14095)
+++ packages/bundlewrap/trunk/docs/content/repo/hooks.md	2017-06-05 19:24:17 UTC (rev 14096)
@@ -24,7 +24,7 @@
 
 ---
 
-**`action_run_start(repo, node, action, **kwargs)`**
+**`action_run_start(repo, node, item, **kwargs)`**
 
 Called each time a `bw apply` command reaches a new action.
 
@@ -36,7 +36,7 @@
 
 ---
 
-**`action_run_end(repo, node, action, duration=None, status=None, **kwargs)`**
+**`action_run_end(repo, node, item, duration=None, status=None, **kwargs)`**
 
 Called each time a `bw apply` command completes processing an action.
 

Modified: packages/bundlewrap/trunk/setup.py
===================================================================
--- packages/bundlewrap/trunk/setup.py	2017-06-05 01:10:12 UTC (rev 14095)
+++ packages/bundlewrap/trunk/setup.py	2017-06-05 19:24:17 UTC (rev 14096)
@@ -16,7 +16,7 @@
 
 setup(
     name="bundlewrap",
-    version="2.18.0",
+    version="2.18.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"