From afbb3df28083d5b91b972a2eb720b1d319e01c25 Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Thu, 17 Mar 2016 23:34:30 +0100 Subject: [PATCH 1/2] remove legacy cruft Signed-off-by: Steven Armstrong --- cdist/conf/type/__apt_ppa/manifest | 5 ++--- docs/changelog | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cdist/conf/type/__apt_ppa/manifest b/cdist/conf/type/__apt_ppa/manifest index 1d90e9c4..a67c7613 100755 --- a/cdist/conf/type/__apt_ppa/manifest +++ b/cdist/conf/type/__apt_ppa/manifest @@ -1,6 +1,6 @@ #!/bin/sh # -# 2011-2014 Steven Armstrong (steven-cdist at armstrong.cc) +# 2011-2016 Steven Armstrong (steven-cdist at armstrong.cc) # # This file is part of cdist. # @@ -21,9 +21,8 @@ name="$__object_id" __package software-properties-common -__package python-software-properties -require="__package/software-properties-common __package/python-software-properties" \ +require="__package/software-properties-common" \ __file /usr/local/bin/remove-apt-repository \ --source "$__type/files/remove-apt-repository" \ --mode 0755 diff --git a/docs/changelog b/docs/changelog index cf7e4e4b..e88b2198 100644 --- a/docs/changelog +++ b/docs/changelog @@ -9,6 +9,8 @@ next: * Type __consul: Add source & cksum for 0.5.2 (Steven Armstrong) * Core: Support object ids '.cdist' (Nico Schottelius) * Type __apt_norecommends: Also setup autoremove options (Dmitry Bogatov) + * Type __apt_ppa: Do not install legacy package python-software-properties + (Steven Armstrong) 3.1.13: 2015-05-16 From 76a78f0d9b51d1f545d8dd7425a17a814782edd3 Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Thu, 17 Mar 2016 23:38:57 +0100 Subject: [PATCH 2/2] /spaces/tab/ Signed-off-by: Steven Armstrong --- docs/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog b/docs/changelog index e88b2198..5a6fa726 100644 --- a/docs/changelog +++ b/docs/changelog @@ -9,7 +9,7 @@ next: * Type __consul: Add source & cksum for 0.5.2 (Steven Armstrong) * Core: Support object ids '.cdist' (Nico Schottelius) * Type __apt_norecommends: Also setup autoremove options (Dmitry Bogatov) - * Type __apt_ppa: Do not install legacy package python-software-properties + * Type __apt_ppa: Do not install legacy package python-software-properties (Steven Armstrong)