[devscripts] 02/06: debuild/rmadison: $envvar → $confvar

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 8fcbf97cbc000f6921cef6d517bdf3135f0372e1
Author: James McCoy <jamessan at debian.org>
Date:   Sat May 9 21:59:15 2015 -0400

    debuild/rmadison: $envvar → $confvar
    
    Clarify that we're not dealing with environment variables when reading
    the configuration for the scripts.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 scripts/debuild.pl  |  4 ++--
 scripts/rmadison.pl | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index f1bb498..f6e74dd 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -369,8 +369,8 @@ if (@ARGV and $ARGV[0] =~ /^--no-?conf$/) {
     }
 
     # And what is left should be any ENV settings
-    foreach my $envvar (@othervars) {
-	$envvar =~ /^DEBUILD_SET_ENVVAR_([^=]*)=(.*)$/ or next;
+    foreach my $confvar (@othervars) {
+	$confvar =~ /^DEBUILD_SET_ENVVAR_([^=]*)=(.*)$/ or next;
 	$ENV{$1}=$2;
 	$save_vars{$1}=1;
 	$modified_conf_msg .= "  $1='$2'\n";
diff --git a/scripts/rmadison.pl b/scripts/rmadison.pl
index 8008256..811aa48 100755
--- a/scripts/rmadison.pl
+++ b/scripts/rmadison.pl
@@ -117,16 +117,16 @@ if (@ARGV and $ARGV[0] =~ /^--no-?conf$/) {
     my $shell_out = `/bin/bash -c '$shell_cmd'`;
     @config_vars = split /\n/, $shell_out, -1;
 
-    foreach my $envvar (@config_vars) {
-	if ($envvar =~ /^RMADISON_URL_MAP_([^=]*)=(.*)$/) {
+    foreach my $confvar (@config_vars) {
+	if ($confvar =~ /^RMADISON_URL_MAP_([^=]*)=(.*)$/) {
 	    $url_map{lc($1)}=$2;
-	} elsif ($envvar =~ /^RMADISON_DEFAULT_URL=(.*)$/) {
+	} elsif ($confvar =~ /^RMADISON_DEFAULT_URL=(.*)$/) {
 	    $default_url=$1;
-	} elsif ($envvar =~ /^RMADISON_ARCHITECTURE=(.*)$/) {
+	} elsif ($confvar =~ /^RMADISON_ARCHITECTURE=(.*)$/) {
 	    $default_arch=$1;
-	} elsif ($envvar =~ /^RMADISON_SSL_CA_FILE=(.*)$/) {
+	} elsif ($confvar =~ /^RMADISON_SSL_CA_FILE=(.*)$/) {
 	    $ssl_ca_file=$1;
-	} elsif ($envvar =~ /^RMADISON_SSL_CA_PATH=(.*)$/) {
+	} elsif ($confvar =~ /^RMADISON_SSL_CA_PATH=(.*)$/) {
 	    $ssl_ca_path=$1;
 	}
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git