tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed parameter revision to ensure in svn module

Browse source
This commit is contained in:
Ossi Salmi 2010-11-17 12:47:19 +02:00 • committed by Timo Mkinen
parent b3aed13226
commit d376a3b024
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
abusehelper/manifests/init.pp
View file

@ -8,8 +8,8 @@ class abusehelper {
include svn::client include svn::client
svn::export { "/usr/local/src/abusehelper": svn::export { "/usr/local/src/abusehelper":
source => "http://abusehelper.googlecode.com/svn/trunk", source => "http://abusehelper.googlecode.com/svn/trunk",
revision => $abusehelper_revision, ensure => $abusehelper_revision,
} }
python::setup::install { "/usr/local/src/abusehelper": python::setup::install { "/usr/local/src/abusehelper":

30
svn/manifests/init.pp
View file

@ -26,21 +26,21 @@ class svn::client {
# Destination directory. # Destination directory.
# $source: # $source:
# Source URL. # Source URL.
# $revision: # $ensure:
# Revision. Defaults to HEAD. # Revision. Defaults to HEAD.
# #
# === Sample usage # === Sample usage
# #
# svn::checkout { "/usr/local/src/graphingwiki": # svn::checkout { "/usr/local/src/graphingwiki":
# source => "http://svn.graphingwiki.webfactional.com/trunk", # source => "http://svn.graphingwiki.webfactional.com/trunk",
# revision => "1959", # ensure => "1959",
# } # }
# #
define svn::checkout($source, $revision="HEAD") { define svn::checkout($source, $ensure="HEAD") {
exec { "svn-co-${name}": exec { "svn-co-${name}":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
command => "svn checkout --non-interactive -r ${revision} ${source} ${name}", command => "svn checkout --non-interactive -r ${ensure} ${source} ${name}",
unless => "test -d ${name}", unless => "test -d ${name}",
require => [ Package["subversion"], File["/etc/subversion/servers"], ], require => [ Package["subversion"], File["/etc/subversion/servers"], ],
} }
@ -48,10 +48,10 @@ define svn::checkout($source, $revision="HEAD") {
exec { "svn-up-${name}": exec { "svn-up-${name}":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
cwd => "${name}", cwd => "${name}",
command => "svn update --non-interactive -r ${revision}", command => "svn update --non-interactive -r ${ensure}",
onlyif => $revision ? { onlyif => $ensure ? {
"HEAD" => "svn status --non-interactive -q -u 2>&1 | egrep '^[[:space:]]+\\*'", "HEAD" => "svn status --non-interactive -q -u 2>&1 | egrep '^[[:space:]]+\\*'",
default => "test $(svn info --non-interactive 2>&1 | awk '/^Revision:/ { print \$2 }') != ${revision}", default => "test $(svn info --non-interactive 2>&1 | awk '/^Revision:/ { print \$2 }') != ${ensure}",
}, },
require => Exec["svn-co-${name}"], require => Exec["svn-co-${name}"],
} }
@ -67,31 +67,31 @@ define svn::checkout($source, $revision="HEAD") {
# Destination directory. # Destination directory.
# $source: # $source:
# Source URL. # Source URL.
# $revision: # $ensure:
# Revision. Defaults to HEAD. # Revision. Defaults to HEAD.
# #
# === Sample usage # === Sample usage
# #
# svn::export { "/usr/local/src/graphingwiki": # svn::export { "/usr/local/src/graphingwiki":
# source => "http://svn.graphingwiki.webfactional.com/trunk/graphingwiki", # source => "http://svn.graphingwiki.webfactional.com/trunk/graphingwiki",
# revision => "1959", # ensure => "1959",
# } # }
# #
define svn::export($source, $revision="HEAD") { define svn::export($source, $ensure="HEAD") {
exec { "svn-export-clean-${name}": exec { "svn-export-clean-${name}":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
command => "rm -fr ${name}", command => "rm -fr ${name}",
onlyif => $revision ? { onlyif => $ensure ? {
"HEAD" => "test -r ${name}/.svnrevision && test $(svn info --non-interactive ${source} 2>&1 | awk '/^Last Changed Rev:/ { print \$4 }') != $(cat ${name}/.svnrevision)", "HEAD" => "test -r ${name}/.svnrevision && test $(svn info --non-interactive ${source} 2>&1 | awk '/^Last Changed Rev:/ { print \$4 }') != $(cat ${name}/.svnrevision)",
default => "test -r ${name}/.svnrevision && test ${revision} != $(cat ${name}/.svnrevision)", default => "test -r ${name}/.svnrevision && test ${ensure} != $(cat ${name}/.svnrevision)",
}, },
require => [ Package["subversion"], File["/etc/subversion/servers"], ], require => [ Package["subversion"], File["/etc/subversion/servers"], ],
} }
exec { "svn-export-${name}": exec { "svn-export-${name}":
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
command => "svn export --non-interactive -r ${revision} ${source} ${name} && svn info --non-interactive -r ${revision} ${source} 2>&1 | awk '/^Last Changed Rev:/ { print \$4 }' > ${name}/.svnrevision", command => "svn export --non-interactive -r ${ensure} ${source} ${name} && svn info --non-interactive -r ${ensure} ${source} 2>&1 | awk '/^Last Changed Rev:/ { print \$4 }' > ${name}/.svnrevision",
creates => "${name}", creates => "${name}",
require => Exec["svn-export-clean-${name}"], require => Exec["svn-export-clean-${name}"],
} }

4
wiki/manifests/init.pp
View file

@ -42,8 +42,8 @@ class wiki::graphingwiki::common {
include svn::client include svn::client
svn::export { "/usr/local/src/graphingwiki": svn::export { "/usr/local/src/graphingwiki":
source => "http://svn.graphingwiki.webfactional.com/trunk", source => "http://svn.graphingwiki.webfactional.com/trunk",
revision => $wiki_gwiki_revision, ensure => $wiki_gwiki_revision,
} }
} }