contradict
/
cdist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1 from ungleich/master 

update from original
This commit is contained in:
Darko Poljak 2016-03-18 12:20:19 +01:00
parent 8ed0c672b1 32557cfa2c
commit e937a939ad
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cdist/conf/type/__apt_ppa/manifest
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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. # This file is part of cdist.
# #
@ -21,9 +21,8 @@
name="$__object_id" name="$__object_id"
__package software-properties-common __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 \ __file /usr/local/bin/remove-apt-repository \
--source "$__type/files/remove-apt-repository" \ --source "$__type/files/remove-apt-repository" \
--mode 0755 --mode 0755

1
docs/changelog
View File

@ -16,6 +16,7 @@ next:
* Type __file: Add NetBSD support (Jonathan A. Kollasch) * Type __file: Add NetBSD support (Jonathan A. Kollasch)
* Type __group: Add NetBSD support (Jonathan A. Kollasch) * Type __group: Add NetBSD support (Jonathan A. Kollasch)
* Type __consul: Add new consul versions (Nico Schottelius) * Type __consul: Add new consul versions (Nico Schottelius)
* Type __apt_ppa: Do not install legacy package python-software-properties (Steven Armstrong)
3.1.13: 2015-05-16 3.1.13: 2015-05-16