From deea255a2b9720c27dc218a32a79b184de36adb1 Mon Sep 17 00:00:00 2001
From: Alois Mahdal <amahdal@redhat.com>
Date: Feb 21 2019 01:21:15 +0000
Subject: Remove obsolete workaround for bz1171881


First, it has been fixed.

Second, it never affected us.  It did affect original library but not
this version ported to JAT.

---

diff --git a/src/preupg.sh.skel b/src/preupg.sh.skel
index b7ff07a..e550d5e 100644
--- a/src/preupg.sh.skel
+++ b/src/preupg.sh.skel
@@ -712,19 +712,17 @@ __preupg__mkfupath_builtin() {
     #
     test "${PREUPG__UPATH:0:1}" = @ || return 0
     local name
-    {
-        dist__test ver.x eq 5 && name=RHEL5_7
-        dist__test ver.x eq 6 && name=RHEL6_7
-        test -n "$name" || {
-            jat__log_error "could not choose fake upath name (this works only on RHEL5/RHEL6)"
-            return 3
-        }
-        test -e "$name" -o -e "$name-results" -o "$name-raw" || {
-            jat__log_error "these must not exist for '@BUILTIN' form to work: $name, $name-results $name-raw"
-            return 3
-        }
-        preupg_fupath "$name" "$PREUPG__UPATH"
-    } >&2   #FIXME: remove block andredirect after bz1171881
+    dist__test ver.x eq 5 && name=RHEL5_7
+    dist__test ver.x eq 6 && name=RHEL6_7
+    test -n "$name" || {
+        jat__log_error "could not choose fake upath name (this works only on RHEL5/RHEL6)"
+        return 3
+    }
+    test -e "$name" -o -e "$name-results" -o "$name-raw" || {
+        jat__log_error "these must not exist for '@BUILTIN' form to work: $name, $name-results $name-raw"
+        return 3
+    }
+    preupg_fupath "$name" "$PREUPG__UPATH"
     echo "$name/all-xccdf.xml" > "$run1tmp/builtin_path"
 }