We no longer write out /etc/rpm/platform, so don't offer to upgrade it.

1 files changed, 2 insertions, 6 deletions

diff --git a/iutil.py b/iutil.py
index 7be68963e..ba1d0b4df 100644
--- a/iutil.py
+++ b/iutil.py
@@ -560,14 +560,14 @@ def isEfi():
 
     return efi
 
-## Generate the /etc/rpm/platform and /etc/rpm/macros files.
+## Generate the /etc/rpm/macros file.
 # @param root The root of the filesystem to create the files in.
 def writeRpmPlatform(root="/"):
     import rhpl.arch
 
     if flags.test:
         return
-    if not flags.updateRpmPlatform and os.access("%s/etc/rpm/platform" %(root,), os.R_OK):
+    if os.access("%s/etc/rpm/platform" %(root,), os.R_OK):
         return
     if not os.access("%s/etc/rpm" %(root,), os.X_OK):
         os.mkdir("%s/etc/rpm" %(root,))
@@ -581,10 +581,6 @@ def writeRpmPlatform(root="/"):
     # now make the current install believe it, too
     rhpl.arch.canonArch = myarch
 
-#    f = open("%s/etc/rpm/platform" %(root,), 'w+')
-#    f.write("%s-redhat-linux\n" %(myarch,))
-#    f.close()
-
     # FIXME: writing /etc/rpm/macros feels wrong somehow
     # temporary workaround for #92285
     if not (myarch.startswith("ppc64") or