rpms/rear
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixup mistake in previous

Browse Source 
Resolves: RHEL-24847
This commit is contained in:
Pavel Cahyna 2024-02-24 21:44:25 +01:00
parent 89149e5f46
commit ca1561bc94
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rear-support-export-TMPDIR.patch
View File

@ -1,30 +1,19 @@
diff --git a/usr/sbin/rear b/usr/sbin/rear diff --git a/usr/sbin/rear b/usr/sbin/rear
index d2cb6c070..3766e6b7d 100755 index d2cb6c070..ea66f0a98 100755
--- a/usr/sbin/rear --- a/usr/sbin/rear
+++ b/usr/sbin/rear +++ b/usr/sbin/rear
@@ -117,6 +117,11 @@ SIMULATE="" @@ -376,6 +376,10 @@ fi
VERBOSE=""
WORKFLOW=""
+# Used to determine whether TMPDIR has been changed in user config
+# Can legitimately change in internal defaults, so we will set it
+# after reading them.
+saved_tmpdir
+
# Parse options
help_note_text="Use '$PROGRAM --help' or 'man $PROGRAM' for more information."
if ! OPTS="$( getopt -n $PROGRAM -o "c:C:dDhsSvVr:" -l "help,version,debugscripts:" -- "$@" )" ; then
@@ -376,6 +381,9 @@ fi
# and fd6 to get input from the user regardless where to STDIN is redirected: # and fd6 to get input from the user regardless where to STDIN is redirected:
source $SHARE_DIR/lib/_input-output-functions.sh source $SHARE_DIR/lib/_input-output-functions.sh
+# Used to determine whether TMPDIR has been changed in user config.
+# Save the current value to detect changes. +# Save the current value to detect changes.
+saved_tmpdir="${TMPDIR-}" +saved_tmpdir="${TMPDIR-}"
+ +
# Keep old log file: # Keep old log file:
test -r "$RUNTIME_LOGFILE" && mv -f "$RUNTIME_LOGFILE" "$RUNTIME_LOGFILE".old 2>/dev/null test -r "$RUNTIME_LOGFILE" && mv -f "$RUNTIME_LOGFILE" "$RUNTIME_LOGFILE".old 2>/dev/null
@@ -446,6 +454,14 @@ for config in site local rescue ; do @@ -446,6 +450,14 @@ for config in site local rescue ; do
test "$( tr -d -c '\r' < $CONFIG_DIR/$config.conf )" && Error "Carriage return character in $CONFIG_DIR/$config.conf (perhaps DOS or Mac format)" test "$( tr -d -c '\r' < $CONFIG_DIR/$config.conf )" && Error "Carriage return character in $CONFIG_DIR/$config.conf (perhaps DOS or Mac format)"
Source "$CONFIG_DIR/$config.conf" || true Source "$CONFIG_DIR/$config.conf" || true
fi fi