Merge branch 'release-2.140.97'

merging in fixes for push repo upstream

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index ef535c646ebc47d7af55688be72ec2bef9dd5d4f..e59199d17313e41ecd12c07236a6246a58212f0e 100644 (file)
--- a/production/feisty_meow_config.ini
+++ b/production/feisty_meow_config.ini
@@ -3,7 +3,7 @@
 # specifies the version of the code that is being constructed here.
 major=2
 minor=140
-revision=96
+revision=97
 build=420
 
 # specifies the remainder of the version record info.

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index aacd77724b2e25f58973e569de6fd9946fecdf81..b2da88704a60f4ace4290f638e8be69cc1eb6030 100644 (file)
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -47,9 +47,8 @@ pushd "$dir" &>/dev/null
 test_or_die "changing to directory: $dir"
 tempfile=$(generate_rev_ctrl_filelist)
 test_or_die "generating revision control file list"
-popd &>/dev/null
 
-perform_revctrl_action_on_file "$tempfile" do_careful_git_update "$(\pwd)"
+perform_revctrl_action_on_file "$tempfile" do_careful_git_update
 test_or_die "doing a careful git update on: $tempfile"
 
 # send our little boat down the stream to the dependent repository.

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 7dd199f4c44632623c3d3b123ffda0909b12983e..3e8ef4c430a36a706bf00437fb730e848a5d8d27 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -450,7 +450,7 @@ function perform_revctrl_action_on_file()
     pushd "$dirname" &>/dev/null
     echo "[$(pwd)]"
     # pass the current directory plus the remaining parameters from function invocation.
-    $action . $*
+    $action . 
     test_or_die "performing action $action on: $(pwd)"
     sep 28
     popd &>/dev/null