Syntax cleanup

shivapoudel · shivapoudel · commit 42bc01a54f24 · 2015-04-17T18:55:10.000+05:45
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
@@ -66,9 +66,7 @@
 # === Authors
 #
 # Sergey Stankevich
-# Ashley Penney
-# Marc Fournier
-# Fotis Gimian
+# Shiva Poudel
 #
 define python::virtualenv (
   $ensure           = present,
@@ -91,7 +89,6 @@
 ) {
 
   if $ensure == 'present' {
-
     $python = $version ? {
       'system' => 'python',
       'pypy'   => 'pypy',
@@ -103,8 +100,7 @@
         'system' => 'virtualenv',
         default  => "virtualenv-${version}",
       }
-    }
-    else {
+    } else {
       $used_virtualenv = $virtualenv
     }
 
@@ -157,8 +153,6 @@
       mode   => $mode
     }
 
-
-
     exec { "python_virtualenv_${venv_dir}":
       command     => "true ${proxy_command} && ${used_virtualenv} ${system_pkgs_flag} -p ${python} ${venv_dir} && ${venv_dir}/bin/pip wheel --help > /dev/null 2>&1 && { ${venv_dir}/bin/pip wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${venv_dir}/bin/pip --log ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} \$wheel_support_flag --upgrade pip ${distribute_pkg} || ${venv_dir}/bin/pip --log ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag}  --upgrade pip ${distribute_pkg} ;}",
       user        => $owner,
@@ -193,7 +187,6 @@
       }
     }
   } elsif $ensure == 'absent' {
-
     file { $venv_dir:
       ensure  => absent,
       force   => true,

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,7 @@`
`66`	`66`	`# === Authors`
`67`	`67`	`#`
`68`	`68`	`# Sergey Stankevich`
`69`		`-# Ashley Penney`
`70`		`-# Marc Fournier`
`71`		`-# Fotis Gimian`
	`69`	`+# Shiva Poudel`
`72`	`70`	`#`
`73`	`71`	`define python::virtualenv (`
`74`	`72`	`$ensure = present,`
`@@ -91,7 +89,6 @@`
`91`	`89`	`) {`
`92`	`90`
`93`	`91`	`if $ensure == 'present' {`
`94`		`-`
`95`	`92`	`$python = $version ? {`
`96`	`93`	`'system' => 'python',`
`97`	`94`	`'pypy' => 'pypy',`
`@@ -103,8 +100,7 @@`
`103`	`100`	`'system' => 'virtualenv',`
`104`	`101`	`default => "virtualenv-${version}",`
`105`	`102`	`}`
`106`		`- }`
`107`		`- else {`
	`103`	`+ } else {`
`108`	`104`	`$used_virtualenv = $virtualenv`
`109`	`105`	`}`
`110`	`106`
`@@ -157,8 +153,6 @@`
`157`	`153`	`mode => $mode`
`158`	`154`	`}`
`159`	`155`
`160`		`-`
`161`		`-`
`162`	`156`	`exec { "python_virtualenv_${venv_dir}":`
`163`	`157`	command => "true ${proxy_command} && ${used_virtualenv} ${system_pkgs_flag} -p ${python} ${venv_dir} && ${venv_dir}/bin/pip wheel --help > /dev/null 2>&1 && { ${venv_dir}/bin/pip wheel --version > /dev/null 2>&1 \|\| wheel_support_flag='--no-use-wheel'; } ; { ${venv_dir}/bin/pip --log ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} \$wheel_support_flag --upgrade pip ${distribute_pkg} \|\| ${venv_dir}/bin/pip --log ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} --upgrade pip ${distribute_pkg} ;}",
`164`	`158`	`user => $owner,`
`@@ -193,7 +187,6 @@`
`193`	`187`	`}`
`194`	`188`	`}`
`195`	`189`	`} elsif $ensure == 'absent' {`
`196`		`-`
`197`	`190`	`file { $venv_dir:`
`198`	`191`	`ensure => absent,`
`199`	`192`	`force => true,`