~ubuntu-branches/ubuntu/quantal/puppet/quantal

« back to all changes in this revision

Viewing changes to lib/puppet/type/file/ensure.rb

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-07-14 01:56:30 UTC
  • mfrom: (1.1.29) (3.1.43 sid)
  • Revision ID: package-import@ubuntu.com-20120714015630-ntj41rkvkq4zph4y
Tags: 2.7.18-1ubuntu1
* Resynchronise with Debian. (LP: #1023931) Remaining changes:
  - debian/puppetmaster-passenger.postinst: Make sure we error if puppet
    config print doesn't work
  - debian/puppetmaster-passenger.postinst: Ensure upgrades from
    <= 2.7.11-1 fixup passenger apache configuration.
* Dropped upstreamed patches:
  - debian/patches/CVE-2012-1906_CVE-2012-1986_to_CVE-2012-1989.patch
  - debian/patches/puppet-12844
  - debian/patches/2.7.17-Puppet-July-2012-CVE-fixes.patch
* Drop Build-Depends on ruby-rspec (in universe):
  - debian/control: remove ruby-rspec from Build-Depends
  - debian/patches/no-rspec.patch: make Rakefile work anyway if rspec
    isn't installed so we can use it in debian/rules.

Show diffs side-by-side

added added

removed removed

Lines of Context:
10
10
      Possible values are *absent*, *present*, *file*, and *directory*.
11
11
      Specifying `present` will match any form of file existence, and
12
12
      if the file is missing will create an empty file. Specifying
13
 
      `absent` will delete the file (and directory if `recurse => true`).
 
13
      `absent` will delete the file (or directory, if `recurse => true`).
14
14
 
15
 
      Anything other than those values will create a symlink. In the interest
16
 
      of readability and clarity, you should use `ensure => link` and
17
 
      explicitly specify a target; however, if a `target` attribute isn't
 
15
      Anything other than the above values will create a symlink; note that
 
16
      symlinks cannot be managed on Windows. In the interest of readability
 
17
      and clarity, symlinks should be created by setting `ensure => link` and
 
18
      explicitly specifying a target; however, if a `target` attribute isn't
18
19
      provided, the value of the `ensure` attribute will be used as the
19
20
      symlink target. The following two declarations are equivalent:
20
21