From 521162f43d787aefd23d6046984f6f3d70f92c10 Mon Sep 17 00:00:00 2001
From: Jan-Piet Mens <jpmens@gmail.com>
Date: Sat, 11 May 2013 16:31:47 +0200
Subject: [PATCH] Add Requirements to rst template, ansible-doc tweak position
& look of Requirements in rst tweak APT's notes as per anhj's wish
---
packaging/apt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/packaging/apt b/packaging/apt
index 50049196e38..41380e63ccf 100644
--- a/packaging/apt
+++ b/packaging/apt
@@ -82,8 +82,11 @@ options:
required: false
default: "yes"
choices: [ "yes", "safe", "full", "dist"]
+requirements: [ python-apt, aptitude ]
author: Matthew Williams
-notes: []
+notes:
+ - Two of the upgrade modes (C(full) and C(dist)) require C(aptitude), otherwise
+ C(apt-get) suffices.
examples:
- code: "apt: pkg=foo update_cache=yes"
description: Update repositories cache and install C(foo) package
@@ -103,7 +106,6 @@ examples:
description: Run the equivalent of C(apt-get update) as a separate step
- code: "apt: update_cache=yes cache_valid_time=3600"
description: Only run C(update_cache=yes) if the last one is more than more than 3600 seconds ago
-requirements: [ python-apt, aptitude ]
'''
import traceback