diff --git a/SOURCES/sos-centos-branding.patch b/SOURCES/sos-centos-branding.patch index 52b7c6d..3c49fa2 100644 --- a/SOURCES/sos-centos-branding.patch +++ b/SOURCES/sos-centos-branding.patch @@ -66,15 +66,6 @@ diff -uNrp sos-3.9.orig/sos/policies/redhat.py sos-3.9/sos/policies/redhat.py release string at the beginning of the NAME field in the `/etc/os-release` file and returns ``True`` if it is found, and ``False`` otherwise. -@@ -334,7 +334,7 @@ support representative. - - def get_upload_url_string(self): - if self.get_upload_url().startswith(RH_API_HOST): -- return "Red Hat Customer Portal" -+ return "Customer Portal" - return self.upload_url or RH_FTP_HOST - - def get_upload_user(self): @@ -389,7 +389,7 @@ class CentOsPolicy(RHELPolicy): ATOMIC = "atomic" @@ -139,12 +130,33 @@ diff -uNrp sos-3.9.orig/sos/policies/redhat.py sos-3.9/sos/policies/redhat.py return False def check_usrmove(self, pkgs): -@@ -309,7 +309,7 @@ support representative. +diff -uNrp sos-3.9.orig/sos/policies/redhat.py sos-3.9/sos/policies/redhat.py +--- sos-3.9.orig/sos/policies/redhat.py 2022-02-23 17:25:33.120951926 +0000 ++++ sos-3.9/sos/policies/redhat.py 2022-02-23 17:27:58.698344937 +0000 +@@ -313,7 +313,7 @@ support representative. return if self.case_id: self.upload_user = input(_( -- "Enter your Red Hat Customer Portal username (empty to use " -+ "Enter your Customer Portal username (empty to use " - "public dropbox): ") +- "Enter your Red Hat Customer Portal username for uploading [" ++ "Enter your Customer Portal username for uploading [" + "empty for anonymous SFTP]: ") ) - if not self.upload_user: + +@@ -335,7 +335,7 @@ support representative. + + def get_upload_url_string(self): + if self.get_upload_url().startswith(RH_API_HOST): +- return "Red Hat Customer Portal" ++ return "Customer Portal" + elif self.get_upload_url().startswith(RH_SFTP_HOST): + return "Red Hat Secure FTP" + return self.upload_url +@@ -403,7 +403,7 @@ support representative. + if not self.upload_url.startswith(RH_API_HOST): + raise + else: +- print("Upload to Red Hat Customer Portal failed. Trying %s" ++ print("Upload to Customer Portal failed. Trying %s" + % RH_SFTP_HOST) + self.upload_url = RH_SFTP_HOST + uploaded = super(RHELPolicy, self).upload_archive(archive)