commit 4de0c4e7bfc006092913ff6dfef0480bfb32794e
author Shane Curcuru <asf@shanecurcuru.org> Sat Mar 23 07:35:02 2024 -0400
committer GitHub <noreply@github.com> Sat Mar 23 07:35:02 2024 -0400
tree 4adf644fccb1e3a88d088780f8a4c8730a342da7
parent b2d256c7c4eecbec3a96cf653f0d7b2f4ec6c124
parent 90856661fe95a08a245719db09bcf1fdd46122cd

Merge branch 'apache:master' into master

www/members/mentor-update.cgi

diff --git a/www/members/mentor-update.cgi b/www/members/mentor-update.cgi
index aa1eb6e..1c80548 100755
--- a/www/members/mentor-update.cgi
+++ b/www/members/mentor-update.cgi
@@ -121,21 +121,23 @@
     _pre mentor_update
   end
 
-  Dir.mktmpdir do |tmpdir|
-    credentials = {user: $USER, password: $PASSWORD}
-    # TODO: investigate if we should to --depth empty and attempt to get only that mentor's file
-    ASF::SVN.svn_('checkout', [MentorFormat::MENTORS_SVN, tmpdir], _, credentials)
-    Dir.chdir tmpdir do
-      if File.exist? fn
-        File.write(fn, mentor_update + "\n")
-        ASF::SVN.svn_('status','.', _)
-        message = "Updating my mentoring data (whimsy)"
-      else
-        File.write(fn, mentor_update + "\n")
-        ASF::SVN.svn_('add', fn, _)
-        message = "#{$USER} += mentoring volunteer (whimsy)"
+  _div.transcript do
+    Dir.mktmpdir do |tmpdir|
+      credentials = {user: $USER, password: $PASSWORD}
+      # TODO: investigate if we should to --depth empty and attempt to get only that mentor's file
+      ASF::SVN.svn_('checkout', [MentorFormat::MENTORS_SVN, tmpdir], _, credentials)
+      Dir.chdir tmpdir do
+        if File.exist? fn
+          File.write(fn, mentor_update + "\n")
+          ASF::SVN.svn_('status','.', _)
+          message = "Updating my mentoring data (whimsy)"
+        else
+          File.write(fn, mentor_update + "\n")
+          ASF::SVN.svn_('add', fn, _)
+          message = "#{$USER} += mentoring volunteer (whimsy)"
+        end
+        rc = ASF::SVN.svn_('commit', fn, _, {msg: message}.merge(credentials))
       end
-      rc = ASF::SVN.svn_('commit', fn, _, {msg: message}.merge(credentials))
     end
   end
 

www/officers/surveys.cgi

diff --git a/www/officers/surveys.cgi b/www/officers/surveys.cgi
index 86e3eab..f21db31 100755
--- a/www/officers/surveys.cgi
+++ b/www/officers/surveys.cgi
@@ -116,18 +116,20 @@
   end
 
   rc = 999 # Ensure it's a bogus value
-  Dir.mktmpdir do |tmpdir|
-    ASF::SVN.svn_('checkout',[get_survey_root(), tmpdir],_,{depth: 'files', user: $USER, password: $PASSWORD})
+  _div.transcript do
+    Dir.mktmpdir do |tmpdir|
+      ASF::SVN.svn_!('checkout',[get_survey_root(), tmpdir],_,{depth: 'files', user: $USER, password: $PASSWORD})
 
-    survey_data = JSON.parse(File.read(filename), :symbolize_names => true)
-    # Add user data (may overwrite existing entry!)
-    survey_data[$USER.to_sym] = formdata
-    # Sort file (to keep diff clean) and write it back
-    survey_data = Hash[survey_data.keys.sort.map {|k| [k, survey_data[k]]}]
+      survey_data = JSON.parse(File.read(filename), :symbolize_names => true)
+      # Add user data (may overwrite existing entry!)
+      survey_data[$USER.to_sym] = formdata
+      # Sort file (to keep diff clean) and write it back
+      survey_data = Hash[survey_data.keys.sort.map {|k| [k, survey_data[k]]}]
 
-    File.write(filename, JSON.pretty_generate(survey_data))
-    Dir.chdir tmpdir do
-      rc = ASF::SVN.svn_('commit', filename, _, {msg: "Survey submission (via whimsy)", user: $USER, password: $PASSWORD})
+      File.write(filename, JSON.pretty_generate(survey_data))
+      Dir.chdir tmpdir do
+        rc = ASF::SVN.svn_!('commit', filename, _, {msg: "Survey submission (via whimsy)", user: $USER, password: $PASSWORD})
+      end
     end
   end
   if rc == 0