From 6aca9c822b640372b0fad24d2a3a288ef2cd6a0f Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Mon, 25 Apr 2011 18:55:58 +0200
Subject: [PATCH] All handlers: stop using "local VAR" outside functions.
(Closes: #530647)
---
ChangeLog | 2 ++
handlers/dup.in | 2 +-
handlers/mysql.in | 4 ++--
handlers/pgsql.in | 4 ++--
handlers/rdiff.in | 2 +-
handlers/svn.in | 4 ++--
handlers/sys.in | 2 +-
7 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2a94593..29ce38d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@ version 0.9.9 -- UNRELEASED
action. Thanks to Olivier Berger <oberger@ouvaton.org> for the patch.
(Closes: #511300)
handler changes
+ all handlers:
+ . Stop using "local VAR" outside functions. (Closes: #530647)
dup:
. Use --tempdir option rather than TMPDIR environment variable.
(Closes Roundup bug #598)
diff --git a/handlers/dup.in b/handlers/dup.in
index e3475b8..1d345a3 100644
--- a/handlers/dup.in
+++ b/handlers/dup.in
@@ -51,7 +51,7 @@ fi
### VServers
# If vservers are configured, check that the ones listed in $vsnames do exist.
-local usevserver=no
+usevserver=no
if [ $vservers_are_available = yes ]; then
if [ "$vsnames" = all ]; then
vsnames="$found_vservers"
diff --git a/handlers/mysql.in b/handlers/mysql.in
index 05ea396..185a98a 100644
--- a/handlers/mysql.in
+++ b/handlers/mysql.in
@@ -24,8 +24,8 @@ getconf configfile /etc/mysql/debian.cnf
# Decide if the handler should operate on a vserver or on the host.
# In the former case, check that $vsname exists and is running.
-local usevserver=no
-local vroot
+usevserver=no
+vroot=''
if [ $vservers_are_available = yes ]; then
if [ -n "$vsname" ]; then
# does it exist ?
diff --git a/handlers/pgsql.in b/handlers/pgsql.in
index ff71ebc..a50d3c7 100644
--- a/handlers/pgsql.in
+++ b/handlers/pgsql.in
@@ -15,8 +15,8 @@ localhost=`hostname`
# Decide if the handler should operate on a vserver or on the host.
# In the former case, check that $vsname exists and is running.
-local usevserver=no
-local vroot
+usevserver=no
+vroot=''
if [ $vservers_are_available = yes ]; then
if [ -n "$vsname" ]; then
# does it exist ?
diff --git a/handlers/rdiff.in b/handlers/rdiff.in
index e391edd..c2f5aa0 100644
--- a/handlers/rdiff.in
+++ b/handlers/rdiff.in
@@ -115,7 +115,7 @@ fi
### CHECK CONFIG ###
# If vservers are configured, check that the ones listed in $vsnames do exist.
-local usevserver=no
+usevserver=no
if [ $vservers_are_available = yes ]; then
if [ "$vsnames" = all ]; then
vsnames="$found_vservers"
diff --git a/handlers/svn.in b/handlers/svn.in
index 5e5531a..bb70eee 100644
--- a/handlers/svn.in
+++ b/handlers/svn.in
@@ -14,8 +14,8 @@ error=0
# Decide if the handler should operate on a vserver or on the host.
# In the former case, check that $vsname exists and is running.
-local usevserver=no
-local vroot
+usevserver=no
+vroot=''
if [ $vservers_are_available = yes ]; then
if [ -n "$vsname" ]; then
# does it exist ?
diff --git a/handlers/sys.in b/handlers/sys.in
index fcf3e31..101745c 100755
--- a/handlers/sys.in
+++ b/handlers/sys.in
@@ -103,7 +103,7 @@ getconf lvm no
getconf vsnames all
# If vservers are configured, check that the ones listed in $vsnames are running.
-local usevserver=no
+usevserver=no
if [ $vservers_are_available = yes ]; then
if [ "$vsnames" = all ]; then
vsnames="$found_vservers"
--
GitLab