Attachment 879013 Details for Bug 1081010 – Path to fix branding in help text

[patch] Path to fix branding in help text

0001-Fix-branding-in-help-text.patch (text/plain), 7.53 KB, created by Juan Hernández on 2014-03-26 14:10:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Juan Hernández

Created: 2014-03-26 14:10:57 UTC

Size: 7.53 KB

patch

obsolete

>From 63997fab5886c5fe42692cbac6467530facf0c19 Mon Sep 17 00:00:00 2001
>From: Juan Hernandez <juan.hernandez@redhat.com>
>Date: Wed, 26 Mar 2014 15:00:38 +0100
>Subject: [PATCH] Fix branding in help text
>
>Resolves: rhbz#1081010
>Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com>
>---
> 0001-Branding.patch | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++--
> rhevm-cli.spec      |   5 +-
> 2 files changed, 137 insertions(+), 4 deletions(-)
>
>diff --git a/0001-Branding.patch b/0001-Branding.patch
>index 2445287..0b6d722 100644
>--- a/0001-Branding.patch
>+++ b/0001-Branding.patch
>@@ -1,4 +1,4 @@
>-From 1e89ca56bddaf536b6c0f41559514b25adccfb5a Mon Sep 17 00:00:00 2001
>+From 1f828e1d963e622f8a8ffbfcebf81ff8f25f86bc Mon Sep 17 00:00:00 2001
> From: Juan Hernandez <juan.hernandez@redhat.com>
> Date: Tue, 4 Mar 2014 16:30:45 +0100
> Subject: [PATCH] Branding
>@@ -8,9 +8,139 @@ This patch changes the product name from oVirt to RHEV.
> Change-Id: Ie6b119126ef4875172258b7bbe397f193084000e
> Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com>
> ---
>- src/ovirtcli/infrastructure/settings.py | 2 +-
>- 1 file changed, 1 insertion(+), 1 deletion(-)
>+ src/cli/context.py                      |  2 +-
>+ src/ovirtcli/command/connect.py         |  4 ++--
>+ src/ovirtcli/command/disconnect.py      |  4 ++--
>+ src/ovirtcli/command/help.py            | 14 +++++++-------
>+ src/ovirtcli/command/list.py            |  6 +++---
>+ src/ovirtcli/infrastructure/settings.py |  2 +-
>+ 6 files changed, 16 insertions(+), 16 deletions(-)
> 
>+diff --git a/src/cli/context.py b/src/cli/context.py
>+index cd1fa44..f317962 100644
>+--- a/src/cli/context.py
>++++ b/src/cli/context.py
>+@@ -199,7 +199,7 @@ class ExecutionContext(object):
>+         """Converts an exception to string and normalizing it."""
>+         err_patterns = [
>+             "[ERROR]::",
>+-            "oVirt API connection failure, "
>++            "RHEV API connection failure, "
>+         ]
>+ 
>+         err_str = str(err)
>+diff --git a/src/ovirtcli/command/connect.py b/src/ovirtcli/command/connect.py
>+index a6fef90..baba181 100644
>+--- a/src/ovirtcli/command/connect.py
>++++ b/src/ovirtcli/command/connect.py
>+@@ -29,7 +29,7 @@ from ovirtcli.state.statemachine import StateMachine
>+ class ConnectCommand(OvirtCommand):
>+ 
>+     name = 'connect'
>+-    description = 'connect to a oVirt manager'
>++    description = 'connect to a RHEV manager'
>+     args_check = (0, len(ConnectCmdShell.OPTIONS))
>+     valid_options = [ (
>+           '--' + item, str
>+@@ -44,7 +44,7 @@ class ConnectCommand(OvirtCommand):
>+ 
>+         == Description ==
>+ 
>+-        Connect to a oVirt manager. This command has two forms. In the first
>++        Connect to a RHEV manager. This command has two forms. In the first
>+         form, no arguments are provided, and the connection details are read
>+         from their respective configuration variables. In the second form,
>+         the connection details are provided as arguments.
>+diff --git a/src/ovirtcli/command/disconnect.py b/src/ovirtcli/command/disconnect.py
>+index 8adc57d..82270be 100644
>+--- a/src/ovirtcli/command/disconnect.py
>++++ b/src/ovirtcli/command/disconnect.py
>+@@ -24,7 +24,7 @@ from cli.messages import Messages
>+ class DisconnectCommand(OvirtCommand):
>+ 
>+     name = 'disconnect'
>+-    description = 'disconnect from oVirt manager'
>++    description = 'disconnect from RHEV manager'
>+     helptext = """\
>+         == Usage ==
>+ 
>+@@ -32,7 +32,7 @@ class DisconnectCommand(OvirtCommand):
>+ 
>+         == Description ==
>+ 
>+-        Disconnect an active connection to oVirt manager, if any. This method
>++        Disconnect an active connection to RHEV manager, if any. This method
>+         can be called multiple times. It is not an error to disconnect when
>+         not connected.
>+         """
>+diff --git a/src/ovirtcli/command/help.py b/src/ovirtcli/command/help.py
>+index a5af3ca..f0da00b 100644
>+--- a/src/ovirtcli/command/help.py
>++++ b/src/ovirtcli/command/help.py
>+@@ -42,9 +42,9 @@ class HelpCommand(OvirtCommand):
>+     helptext1 = """\
>+         == Introduction ==
>+ 
>+-        Welcome to $product-shell. This program is an interactive command-line
>+-        interface into $product Virtualization. You can type any command in 
>+-        the interface below.
>++        Welcome to rhevm-shell. This program is an interactive command-line
>++        interface into Red Hat Enterprise Virtualization. You can type any
>++        command in the interface below.
>+ 
>+         == Available Commands ==
>+ 
>+@@ -52,7 +52,7 @@ class HelpCommand(OvirtCommand):
>+ 
>+         Type 'help <command>' for any of these commands to show detailed help.
>+         The first command you probably want to issue is 'help connect' to
>+-        learn how to connect to a oVirt manager.
>++        learn how to connect to a RHEV manager.
>+ 
>+         == Command Syntax ==
>+ 
>+@@ -87,9 +87,9 @@ class HelpCommand(OvirtCommand):
>+ 
>+         == Configuration File ==
>+ 
>+-        oVirt-Shell can be configured with configuration file, configuration file
>+-        ( ~/.ovirtshellrc) automatically created under your home directory (if not exist)
>+-        at first ovirt-shell execution.
>++        rhevm-shell can be configured with configuration file, configuration file
>++        ( ~/.rhevmshellrc) automatically created under your home directory (if not exist)
>++        at first rhevm-shell execution.
>+         """
>+ 
>+     def execute(self):
>+diff --git a/src/ovirtcli/command/list.py b/src/ovirtcli/command/list.py
>+index c408dc9..e43fd09 100644
>+--- a/src/ovirtcli/command/list.py
>++++ b/src/ovirtcli/command/list.py
>+@@ -37,7 +37,7 @@ class ListCommand(OvirtCommand):
>+ 
>+         List or search for objects of a certain type. There are two forms. If
>+         only <type> is provided, all objects of the specified type are
>+-        returned. If a search query is given, it must be a valid oVirt search
>++        returned. If a search query is given, it must be a valid RHEV search
>+         query. In that case objects matching the query are returned.
>+ 
>+         == Supported Help formats ==
>+@@ -102,13 +102,13 @@ class ListCommand(OvirtCommand):
>+           
>+         - This example list all vms having memory size of 1073741824 using client 
>+           side filtering (this kind of filtering is useful on non queryable collections
>+-          or for filtering resources based on properties which are not supported by oVirt
>++          or for filtering resources based on properties which are not supported by RHEV
>+           querying dialect)
>+     
>+           $ list vms --kwargs "memory=1073741824"
>+           
>+         - This example retrieves vm disk with name 'Disk 3' using client side filtering 
>+-          as oVirt dialect is not available on vm disks collection.          
>++          as RHEV dialect is not available on vm disks collection.
>+           
>+           $ list disks --vm-identifier myvm --kwargs "name=Disk 3"
>+ 
> diff --git a/src/ovirtcli/infrastructure/settings.py b/src/ovirtcli/infrastructure/settings.py
> index 4bbc7d9..5d51e87 100644
> --- a/src/ovirtcli/infrastructure/settings.py
>diff --git a/rhevm-cli.spec b/rhevm-cli.spec
>index 70111cb..231423d 100644
>--- a/rhevm-cli.spec
>+++ b/rhevm-cli.spec
>@@ -1,6 +1,6 @@
> Name: rhevm-cli
> Version: 3.4.0.6
>-Release: 2%{?dist}
>+Release: 3%{?dist}
> Summary: RHEV-M Engine Command Line Interface
> Group: Development/Libraries
> License: ASL 2.0
>@@ -62,6 +62,9 @@ popd
> %doc LICENSE
> 
> %changelog
>+* Wed Mar 26 2014 Juan Hernandez <juan.hernandez@redhat.com> - 3.4.0.6-3
>+- Fix branding in help text #1081010.
>+
> * Tue Mar 04 2014 Juan Hernandez <juan.hernandez@redhat.com> - 3.4.0.6-2
> - Fix branding #1072438.
> 
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1081010: 879013