Attachment 693298 Details for Bug 815975 – Proposed patch to replace one occurance

[patch] Proposed patch to replace one occurance

0001-815975-Replace-one-and-only-one-arch-specific-patter.patch (text/plain), 1.32 KB, created by Vitaly Kuznetsov on 2013-02-05 10:26:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vitaly Kuznetsov

Created: 2013-02-05 10:26:09 UTC

Size: 1.32 KB

patch

obsolete

>From e8a762e44c656a6003cd105f0078d1119d67cb7d Mon Sep 17 00:00:00 2001
>From: Vitaly Kuznetsov <vitty@redhat.com>
>Date: Tue, 5 Feb 2013 11:23:18 +0100
>Subject: [PATCH] 815975 Replace one and only one arch-specific pattern
>
>---
> rhui-2.0/tools/src/rhui/tools/screens/repo.py | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
>diff --git a/rhui-2.0/tools/src/rhui/tools/screens/repo.py b/rhui-2.0/tools/src/rhui/tools/screens/repo.py
>index 0bca3cb..2738664 100644
>--- a/rhui-2.0/tools/src/rhui/tools/screens/repo.py
>+++ b/rhui-2.0/tools/src/rhui/tools/screens/repo.py
>@@ -521,13 +521,11 @@ class RepoScreen(Screen):
>         '''
>         entitlement_map = self.pulp.custom_repo_entitlements()
> 
>-        educated_guess = path
>+        educated_guess, replace_count = re.subn("(i386|x86_64)","$basearch", path)
> 
>-        if not ('i386' in educated_guess and \
>-            'x86_64' in educated_guess):
>-
>-            for arch in ['i386', 'x86_64']:
>-                educated_guess = educated_guess.replace(arch, '$basearch')
>+        if replace_count > 1:
>+            # There are multiple arch-like patterns, refusing to guess at all
>+            educated_guess = path
> 
>         self.prompt.write('Based on the repository\'s relative path, the suggested entitlement path is:')
>         self.prompt.write('  ' + educated_guess)
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 815975: 580019 | 580020 | 580021 | 580022 | 580826 | 584992 | 601923 | 693298 | 696464