Attachment 599317 Details for Bug 838658 – Patching log

Patching log

log (text/plain), 16.02 KB, created by mkovacik on 2012-07-20 06:51:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mkovacik

Created: 2012-07-20 06:51:23 UTC

Size: 16.02 KB

patch

obsolete

>[root@ip-10-2-198-125 ~]# rpm -ql rh-rhui-tools | grep client.py
>/usr/lib/python2.6/site-packages/rhui/rpm/client.py
>/usr/lib/python2.6/site-packages/rhui/rpm/client.pyc
>/usr/lib/python2.6/site-packages/rhui/rpm/client.pyo
>/usr/lib/python2.6/site-packages/rhui/tools/screens/client.py
>/usr/lib/python2.6/site-packages/rhui/tools/screens/client.pyc
>/usr/lib/python2.6/site-packages/rhui/tools/screens/client.pyo
>[root@ip-10-2-198-125 ~]# cp -f /usr/lib/python2.6/site-packages/rhui/tools/screens/client.py ./
>[root@ip-10-2-198-125 ~]# man patch
>[root@ip-10-2-198-125 ~]# cat > 838658.patch
>@@ -60,6 +60,7 @@ class ClientScreen(Screen):
>         # Load entitlement certificate
>         redhat_ents = self.cert_manager.valid_entitlements()
>         redhat_ents = sorted(redhat_ents, key=lambda ent: ent.name)
>+        redhat_ents_filtered = []
>
>         # Cross reference with Red Hat repos deployed in the RHUI to mark them
>         # specifically
>@@ -72,6 +73,7 @@ class ClientScreen(Screen):
>             if len([repo for repo in cluster_repos \
>                     if e.label in repo['groupid']]):
>                 redhat_ent_names.append(name)
>+                redhat_ents_filtered.append(e)
>
>         # Load custom repositories and generate display names for the menu
>         ent_repo_mappings = self.pulp.custom_repo_entitlements()
>@@ -85,7 +87,7 @@ class ClientScreen(Screen):
>             # List each repo for that path underneath it, indented to match
>             # the menu
>             for repo in ent.repos:
>-                if repo['repo_id'] not in cluster['repo_ids']:
>+                if repo['id'] not in cluster['repo_ids']:
>                     continue
>                 menu_item += '             %s\n' % repo['name']
>
>@@ -122,7 +124,7 @@ class ClientScreen(Screen):
>             return
>
>         # Map selected indices back to ent objects
>-        redhat_selected_ents = [redhat_ents[index] for index in selected_section_indices[redhat_section_name]]
>+        redhat_selected_ents = [redhat_ents_filtered[index] for index in selected_section_indices[redhat_section_name]]
>         custom_selected_ents = [custom_ents[index] for index in selected_section_indices[custom_section_name]]^C
>[root@ip-10-2-198-125 ~]# cat > 838658.patch
>index 7e3790d..c17eef8 100644
>--- a/rhui-2.0/tools/src/rhui/tools/screens/client.py
>+++ b/rhui-2.0/tools/src/rhui/tools/screens/client.py
>@@ -60,6 +60,7 @@ class ClientScreen(Screen):
>         # Load entitlement certificate
>         redhat_ents = self.cert_manager.valid_entitlements()
>         redhat_ents = sorted(redhat_ents, key=lambda ent: ent.name)
>+        redhat_ents_filtered = []
>
>         # Cross reference with Red Hat repos deployed in the RHUI to mark them
>         # specifically
>@@ -72,6 +73,7 @@ class ClientScreen(Screen):
>             if len([repo for repo in cluster_repos \
>                     if e.label in repo['groupid']]):
>                 redhat_ent_names.append(name)
>+                redhat_ents_filtered.append(e)
>
>         # Load custom repositories and generate display names for the menu
>         ent_repo_mappings = self.pulp.custom_repo_entitlements()
>@@ -85,7 +87,7 @@ class ClientScreen(Screen):
>             # List each repo for that path underneath it, indented to match
>             # the menu
>             for repo in ent.repos:
>-                if repo['repo_id'] not in cluster['repo_ids']:
>+                if repo['id'] not in cluster['repo_ids']:
>                     continue
>                 menu_item += '             %s\n' % repo['name']
>
>@@ -122,7 +124,7 @@ class ClientScreen(Screen):
>             return
>
>         # Map selected indices back to ent objects
>-        redhat_selected_ents = [redhat_ents[index] for index in selected_section_indices[redhat_section_name]]
>+        redhat_selected_ents = [redhat_ents_filtered[index] for index in selected_section_indices[redhat_section_name]]
>         custom_selected_ents = [custom_ents[index] for index in selected_section_indices[custom_section_name]]
>[root@ip-10-2-198-125 ~]# vim 838658.patch
>[root@ip-10-2-198-125 ~]# patch -b /usr/lib/python2.6/site-packages/rhui/tools/screens/client.py < 838658.patch
>patching file /usr/lib/python2.6/site-packages/rhui/tools/screens/client.py
>Hunk #4 succeeded at 124 with fuzz 1.
>[root@ip-10-2-198-125 ~]# vim /usr/lib/python2.6/site-packages/rhui/tools/screens/client.py
>[root@ip-10-2-198-125 ~]# rhui-manager
>
>------------------------------------------------------------------------------
>             -= Red Hat Update Infrastructure Management Tool =-
>
>
>-= Home =-
>
>   r   manage repositories
>   c   manage content delivery servers (CDS)
>   s   synchronization status and scheduling
>   e   create entitlement certificates and client configuration RPMs
>   n   manage Red Hat entitlement certificates
>   u   manage users
>   i   manage identity certificate
>
>   logout
>       removes stored authentication credentials and exits
>
>   <   move to the previous screen
>   ^, home
>       move to the home screen
>   /, clear
>       clears the screen
>   ?, help
>       display help
>   q, quit, exit
>       exit
>
>                                       Connected: ip-10-2-198-125.ec2.internal
>------------------------------------------------------------------------------
>rhui (home) => r
>
>------------------------------------------------------------------------------
>             -= Red Hat Update Infrastructure Management Tool =-
>
>
>-= Repository Management =-
>
>   l   list repositories currently managed by the RHUI
>   i   display detailed information on a repository
>   a   add a new Red Hat content repository
>   c   create a new custom repository
>   d   delete a repository from the RHUI
>   u   upload content to a custom repository
>   p   list packages in a repository
>
>                                       Connected: ip-10-2-198-125.ec2.internal
>------------------------------------------------------------------------------
>rhui (repo) => l
>
>Custom Repositories
>  gkrellm-x86_64
>
>Red Hat Repositories
>  Red Hat Enterprise Linux 6 Server - Optional (Source RPMs) from RHUI (6Server-i386)
>  Red Hat Enterprise Linux 6 Server - Optional (Source RPMs) from RHUI (6Server-x86_64)
>
>
>------------------------------------------------------------------------------
>rhui (repo) => <
>
>------------------------------------------------------------------------------
>             -= Red Hat Update Infrastructure Management Tool =-
>
>
>-= Home =-
>
>   r   manage repositories
>   c   manage content delivery servers (CDS)
>   s   synchronization status and scheduling
>   e   create entitlement certificates and client configuration RPMs
>   n   manage Red Hat entitlement certificates
>   u   manage users
>   i   manage identity certificate
>
>                                       Connected: ip-10-2-198-125.ec2.internal
>------------------------------------------------------------------------------
>rhui (home) => c
>
>------------------------------------------------------------------------------
>             -= Red Hat Update Infrastructure Management Tool =-
>
>
>-= Content Delivery Server (CDS) Management =-
>
>   l   list all CDS clusters and instances managed by the RHUI
>   i   display detailed information on a CDS cluster
>   a   register (add) a new CDS instance
>   m   move CDS(s) to a different cluster
>   d   unregister (delete) a CDS instance from the RHUI
>   s   associate a repository with a CDS cluster
>   u   unassociate a repository from a CDS cluster
>
>                                       Connected: ip-10-2-198-125.ec2.internal
>------------------------------------------------------------------------------
>rhui (cds) => i
>
>
>Select one or more CDS clusters:
>
>  -  1 : cluster
>  -  2 : cluster2
>Enter value (1-2) to toggle selection, 'c' to confirm selections, or '?' for more commands: Enter value (1-2) to toggle selection, 'c' to confirm selections, or '?' for more commands: 1
>
>Select one or more CDS clusters:
>
>  x  1 : cluster
>  -  2 : cluster2
>Enter value (1-2) to toggle selection, 'c' to confirm selections, or '?' for more commands: c
>
>-= RHUI CDS Clusters =-
>
>  cluster
>  -------
>
>    CDS Instances
>    -------------
>    domU-12-31-39-01-68-61.compute-1.internal
>      hostname:        domU-12-31-39-01-68-61.compute-1.internal
>      client hostname: domU-12-31-39-01-68-61.compute-1.internal
>    ip-10-108-42-187.ec2.internal
>      hostname:        ip-10-108-42-187.ec2.internal
>      client hostname: ip-10-108-42-187.ec2.internal
>
>    Repositories
>    ------------
>    Red Hat Enterprise Linux 6 Server - Optional (Source RPMs) from RHUI (6Server-i386)
>    Red Hat Enterprise Linux 6 Server - Optional (Source RPMs) from RHUI (6Server-x86_64)
>    gkrellm-x86_64
>
>
>
>
>------------------------------------------------------------------------------
>rhui (cds) => <
>
>------------------------------------------------------------------------------
>             -= Red Hat Update Infrastructure Management Tool =-
>
>
>-= Home =-
>
>   r   manage repositories
>   c   manage content delivery servers (CDS)
>   s   synchronization status and scheduling
>   e   create entitlement certificates and client configuration RPMs
>   n   manage Red Hat entitlement certificates
>   u   manage users
>   i   manage identity certificate
>
>                                       Connected: ip-10-2-198-125.ec2.internal
>------------------------------------------------------------------------------
>rhui (home) => e
>
>------------------------------------------------------------------------------
>             -= Red Hat Update Infrastructure Management Tool =-
>
>
>-= Client Entitlement Management =-
>
>   e   generate an entitlement certificate
>   c   create a client configuration RPM from an entitlement certificate
>
>                                       Connected: ip-10-2-198-125.ec2.internal
>------------------------------------------------------------------------------
>rhui (client) =>
>rhui (client) => e
>
>Select the CDS cluster that clients using this entitlement certificate will use to download content:
>
>  1  - cluster
>  2  - cluster2
>Enter value (1-2) or 'b' to abort: 1
>
>Select one or more repositories to include in the entitlement certificate:
>(an * next to a Red Hat repository indicates it is deployed in the RHUI)
>
>  Custom Repositories
>    -  1 : gkrellm/$basearch
>             gkrellm-x86_64
>
>
>  Red Hat Repositories
>    -  2 : Red Hat Enterprise Linux 6 Server - Optional (Source RPMs) from RHUI
>
>Enter value (1-2) to toggle selection, 'c' to confirm selections, or '?' for more commands: 1-2
>
>Select one or more repositories to include in the entitlement certificate:
>(an * next to a Red Hat repository indicates it is deployed in the RHUI)
>
>  Custom Repositories
>    x  1 : gkrellm/$basearch
>             gkrellm-x86_64
>
>
>  Red Hat Repositories
>    x  2 : Red Hat Enterprise Linux 6 Server - Optional (Source RPMs) from RHUI
>
>Enter value (1-2) to toggle selection, 'c' to confirm selections, or '?' for more commands: c
>
>
>Name of the certificate. This will be used as the name of the certificate file
>(name.crt) and its associated private key (name.key). Choose something that will
>help identify the products contained with it:
>rh1
>
>Local directory in which to save the generated certificate [current directory]:
>^Z
>[1]+  Stopped                 rhui-manager
>[root@ip-10-2-198-125 ~]# mkdir -p /root/rh1
>[root@ip-10-2-198-125 ~]# ld -d /root/rh1
>/root/rh1: file not recognized: Is a directory
>[root@ip-10-2-198-125 ~]# ls -d /root/rh1
>/root/rh1
>[root@ip-10-2-198-125 ~]# fg
>rhui-manager
>/root/rh1
>
>Number of days the certificate should be valid [365]:
>
>
>Repositories to be included in the entitlement certificate:
>
>  Custom Entitlements
>    gkrellm/$basearch
>
>  Red Hat Repositories
>    Red Hat Enterprise Linux 6 Server - Optional (Source RPMs) from RHUI
>
>Proceed? (y/n) y
>
>.......................................................+++
>.........+++
>Entitlement certificate created at /root/rh1/rh1.crt
>
>------------------------------------------------------------------------------
>rhui (client) => openssl x509 -in /root/rh1/rh1.crt -noout -text
>Invalid menu item; type "?" for a list of available commands
>rhui (client) => q
>[root@ip-10-2-198-125 ~]# openssl x509 -in /root/rh1/rh1.crt -noout -text
>Certificate:
>    Data:
>        Version: 3 (0x2)
>        Serial Number: 258 (0x102)
>        Signature Algorithm: sha1WithRSAEncryption
>        Issuer: C=US, ST=NC, L=Raleigh, CN=localhost
>        Validity
>            Not Before: Jul 20 06:42:25 2012 GMT
>            Not After : Jul 20 06:42:25 2013 GMT
>        Subject: CN=Red Hat Update Infrastructure
>        Subject Public Key Info:
>            Public Key Algorithm: rsaEncryption
>                Public-Key: (2048 bit)
>                Modulus:
>                    00:c4:12:76:02:a3:f3:7b:01:44:73:d9:96:ef:0a:
>                    cd:80:91:b6:f7:59:c5:12:ef:c3:80:3e:0c:ff:e9:
>                    3c:9b:fb:4b:13:d4:43:af:dc:9e:b9:05:6e:c5:8d:
>                    2a:40:d3:66:24:dd:72:14:a8:b6:aa:2a:df:8d:02:
>                    d1:98:6c:dd:0d:db:3d:d8:ee:fc:81:24:e9:ff:8e:
>                    24:cc:55:92:66:40:92:71:7c:79:23:6f:1b:c5:65:
>                    e6:78:03:35:6c:43:59:f6:05:5b:78:b1:d8:f7:bf:
>                    cd:50:17:f0:2a:22:90:b7:8a:3d:8c:d8:38:72:60:
>                    cc:0a:f8:a4:f4:34:43:7e:f8:a5:01:19:98:da:c2:
>                    81:80:00:41:52:98:2d:e8:2e:74:f3:4d:56:22:c6:
>                    4f:ac:48:e3:50:fe:8b:ca:4b:50:b3:af:37:8f:3a:
>                    44:5c:69:dd:3d:2e:9b:ce:78:19:b7:b3:d8:1d:79:
>                    f9:f3:3d:fd:e6:a0:f6:2b:cb:63:a1:a2:e2:c3:11:
>                    81:cb:51:b3:64:4b:30:c5:5a:c2:91:ca:77:51:f1:
>                    02:93:6d:9c:10:11:c5:d4:f6:65:d6:92:85:9a:60:
>                    02:f0:ff:e7:2a:c0:f6:90:13:66:b8:e1:e1:61:0c:
>                    06:09:a7:4c:38:16:59:03:f2:55:0d:9e:68:bf:39:
>                    8e:4b
>                Exponent: 65537 (0x10001)
>        X509v3 extensions:
>            X509v3 Basic Constraints:
>                CA:FALSE
>            1.3.6.1.4.1.2312.9.2.10000.1.1:
>                ..Custom Repositories - 10000
>            1.3.6.1.4.1.2312.9.2.10000.1.2:
>                ..custom-10000
>            1.3.6.1.4.1.2312.9.2.10000.1.6:
>                ..gkrellm/$basearch
>            1.3.6.1.4.1.2312.9.2.1165.1.1:
>                .DRed Hat Enterprise Linux 6 Server - Optional (Source RPMs) from RHUI
>            1.3.6.1.4.1.2312.9.2.1165.1.2:
>                .'rhel-6-rhui-server-optional-source-rpms
>            1.3.6.1.4.1.2312.9.2.1165.1.6:
>                .L/content/dist/rhel/rhui/server/6/$releasever/$basearch/optional/source/SRPMS
>    Signature Algorithm: sha1WithRSAEncryption
>        22:f6:38:48:c1:5f:b9:c6:99:c8:b2:b0:ed:fa:98:81:0e:ae:
>        7c:1d:1e:c8:f8:68:f0:70:c1:36:f7:b8:3b:1c:6a:4a:9e:c9:
>        76:ac:76:2b:13:21:b7:89:48:a9:d6:4a:de:6b:24:48:01:f3:
>        59:0a:08:e4:57:b7:18:eb:09:30:f1:22:1c:d6:5d:66:e1:0b:
>        46:38:93:af:51:97:c0:38:41:6e:8b:3a:40:d6:4c:ff:c2:bd:
>        b0:bc:d0:82:db:2c:e3:c5:3d:e0:94:45:44:96:40:44:83:4e:
>        84:ba:83:e3:48:47:8f:d0:71:1d:fe:7e:82:ca:f5:7a:9a:8f:
>        f5:42:8b:19:bb:8b:34:8a:bb:16:4c:ca:f5:17:6f:5a:cc:05:
>        1f:72:c9:8b:e6:5f:c4:27:f6:65:25:9c:1c:59:b3:7d:5a:33:
>        bf:d6:3d:87:76:d8:bf:7a:a1:6f:2c:46:c1:a2:42:11:05:61:
>        50:15:0a:53:bd:8e:da:59:44:6d:d2:66:9e:65:b7:59:f0:6e:
>        39:99:f0:d8:ed:13:19:e1:c0:40:29:92:74:6e:c9:8d:1e:ba:
>        2b:b3:ca:35:14:ee:ce:4b:b3:3c:c4:81:93:5e:bb:5b:95:04:
>        85:a3:d4:48:82:68:72:05:ea:16:cc:5f:ef:d2:4d:dd:24:ea:
>        6a:a8:7a:1d
>[root@ip-10-2-198-125 ~]#
>[root@ip-10-2-198-125 ~]# rpm -qi rh-rhui-tools
>Name        : rh-rhui-tools                Relocations: (not relocatable)
>Version     : 2.0.68                            Vendor: Red Hat, Inc.
>Release     : 1.el6_3                       Build Date: Tue 03 Jul 2012 02:26:11 PM EDT
>Install Date: Thu 12 Jul 2012 07:05:12 AM EDT      Build Host: x86-003.build.bos.redhat.com
>Group       : Applications/Internet         Source RPM: rh-rhui-tools-2.0.68-1.el6_3.src.rpm
>Size        : 711236                           License: GPLv2
>Signature   : (none)
>Packager    : Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla>
>URL         : http://redhat.com
>Summary     : Tools for installing and configuring the Red Hat Update Infrastructure
>Description :
>Tools necessary to configure the Red Hat Update Infrastructure.
>[root@ip-10-2-198-125 ~]#

Actions: View

Attachments on bug 838658: 599317 | 602083