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

python: Lint fixes, reindent

Browse source
This commit is contained in:
Ossi Salmi 2016-02-24 10:36:00 +02:00
parent 990dd7e2c6
commit 1fea7f6080
1 changed files with 64 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
python/manifests/init.pp
View file

@ -2,21 +2,21 @@
#
class python {
package { "python":
ensure => installed,
notify => $::operatingsystem ? {
"openbsd" => Exec["python-links"],
default => undef,
},
}
package { "python":
ensure => installed,
notify => $::operatingsystem ? {
"openbsd" => Exec["python-links"],
default => undef,
},
}
exec { "python-links":
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
command => "pkg_info python | egrep '^[ ]*ln -sf' | sh",
user => "root",
group => "wheel",
refreshonly => true,
}
exec { "python-links":
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
command => "pkg_info python | egrep '^[ ]*ln -sf' | sh",
user => "root",
group => "wheel",
refreshonly => true,
}
}
@ -25,11 +25,11 @@ class python {
#
class python::python26 {
if $::operatingsystem in ["CentOS","RedHat"] and versioncmp($::operatingsystemrelease, "6") < 0 {
package { "python26":
ensure => installed,
}
if $::operatingsystem in ["CentOS","RedHat"] and versioncmp($::operatingsystemrelease, "6") < 0 {
package { "python26":
ensure => installed,
}
}
}
@ -38,14 +38,14 @@ class python::python26 {
#
class python::m2crypto {
package { "m2crypto":
ensure => installed,
name => $::operatingsystem ? {
"debian" => "python-m2crypto",
"ubuntu" => "python-m2crypto",
default => "m2crypto",
}
package { "m2crypto":
ensure => installed,
name => $::operatingsystem ? {
"debian" => "python-m2crypto",
"ubuntu" => "python-m2crypto",
default => "m2crypto",
}
}
}
@ -54,12 +54,12 @@ class python::m2crypto {
#
# === Parameters
#
# $name:
# Source directory.
# $python:
# Python executable name. Defaults to python.
# $source:
# Source path to package archive.
# $name:
# Source directory.
# $python:
# Python executable name. Defaults to python.
# $source:
# Source path to package archive.
#
# === Sample usage
#
@ -68,37 +68,37 @@ class python::m2crypto {
# }
#
define python::setup::install(
$python="python",
$source=undef,
$python="python",
$source=undef,
) {
if $source {
$filename = basename($source)
file { "/usr/local/src/${filename}":
ensure => present,
mode => "0644",
owner => "root",
group => $::operatingsystem ? {
"openbsd" => "wheel",
default => "root",
},
source => $source,
}
util::extract::tar { $name:
ensure => latest,
strip => "1",
source => "/usr/local/src/${filename}",
require => File["/usr/local/src/${filename}"],
before => Exec["python-setup-install-${name}"],
}
if $source {
$filename = basename($source)
file { "/usr/local/src/${filename}":
ensure => present,
mode => "0644",
owner => "root",
group => $::operatingsystem ? {
"openbsd" => "wheel",
default => "root",
},
source => $source,
}
util::extract::tar { $name:
ensure => latest,
strip => "1",
source => "/usr/local/src/${filename}",
require => File["/usr/local/src/${filename}"],
before => Exec["python-setup-install-${name}"],
}
}
exec { "python-setup-install-${name}":
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
cwd => $name,
command => "/bin/sh -c 'umask 022; ${python} setup.py install && mkdir -p build'",
creates => "${name}/build",
}
exec { "python-setup-install-${name}":
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
cwd => $name,
command => "/bin/sh -c 'umask 022; ${python} setup.py install && mkdir -p build'",
creates => "${name}/build",
}
}
@ -107,8 +107,8 @@ define python::setup::install(
#
# === Parameters
#
# $name:
# File name to compile.
# $name:
# File name to compile.
#
# === Sample usage
#
@ -116,9 +116,9 @@ define python::setup::install(
#
define python::compile() {
exec { "python -c \"import py_compile; py_compile.compile('${name}')\"":
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
onlyif => "test '${name}' -nt '${name}c'",
}
exec { "python -c \"import py_compile; py_compile.compile('${name}')\"":
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
onlyif => "test '${name}' -nt '${name}c'",
}
}