← Back to branch summary

~bkerensa/ubuntu/raring/puppet/new-upstream-release

« back to all changes in this revision

Viewing changes to spec/fixtures/unit/parser/lexer/defineoverrides.pp

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-07-25 01:00:37 UTC
  • mfrom: (1.1.24 upstream) (3.1.25 sid)
  • Revision ID: james.westby@ubuntu.com-20110725010037-875vuxs10eboqgw3
Tags: 2.7.1-1ubuntu1
https://launchpad.net/bugs/641001
* Merge from debian unstable.  Remaining changes:
  - debian/puppetmaster-passenger.postinst: Use cacrl instead of hostcrl to
    set the location of the CRL in apache2 configuration. Fix apache2
    configuration on upgrade as well (LP: #641001)
  - move all puppet dependencies to puppet-common since all the code
    actually located in puppet-common.
  - move libagueas from a recommend to a dependency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
spec/fixtures/unit/parser/lexer/defineoverrides.pp
 
1
# $Id$
 
2
 
 
3
$file = "/tmp/defineoverrides1"
 
4
 
 
5
define myfile($mode) {
 
6
    file { $name: ensure => file, mode => $mode }
 
7
}
 
8
 
 
9
class base {
 
10
    myfile { $file: mode => 644 }
 
11
}
 
12
 
 
13
class sub inherits base {
 
14
    Myfile[$file] { mode => 755, } # test the end-comma
 
15
}
 
16
 
 
17
include sub