Attachment 895170 Details for Bug 1097331 – Patch to fix the version number reporting

[patch] Patch to fix the version number reporting

0001-cli-Fix-reporting-of-version-numbers.patch (text/plain), 3.16 KB, created by Juan Hernández on 2014-05-13 15:05:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Juan Hernández

Created: 2014-05-13 15:05:55 UTC

Size: 3.16 KB

patch

obsolete

>From 255707354dc9bcc552003e77f5dd1126f1833a56 Mon Sep 17 00:00:00 2001
>From: Juan Hernandez <juan.hernandez@redhat.com>
>Date: Tue, 13 May 2014 11:38:22 +0200
>Subject: [PATCH] cli: Fix reporting of version numbers
>
>The upstream CLI reports versions of the Python SDK and CLI packages
>using the upstream names ovirt-engine-sdk and ovirt-shell. This needs to
>be changed in the downstream branding patch.
>
>Resolves: rhbz#1097331
>Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com>
>---
> 0001-Branding.patch | 22 +++++++++++++++++++---
> rhevm-cli.spec      |  5 ++++-
> 2 files changed, 23 insertions(+), 4 deletions(-)
>
>diff --git a/0001-Branding.patch b/0001-Branding.patch
>index 0b6d722..4ee27cd 100644
>--- a/0001-Branding.patch
>+++ b/0001-Branding.patch
>@@ -1,4 +1,4 @@
>-From 1f828e1d963e622f8a8ffbfcebf81ff8f25f86bc Mon Sep 17 00:00:00 2001
>+From ffbc1cef7f3505fd5d83a92d970d1ea1e9a6dc6c 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
>@@ -13,8 +13,9 @@ Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com>
>  src/ovirtcli/command/disconnect.py      |  4 ++--
>  src/ovirtcli/command/help.py            | 14 +++++++-------
>  src/ovirtcli/command/list.py            |  6 +++---
>+ src/ovirtcli/infrastructure/context.py  |  4 ++--
>  src/ovirtcli/infrastructure/settings.py |  2 +-
>- 6 files changed, 16 insertions(+), 16 deletions(-)
>+ 7 files changed, 18 insertions(+), 18 deletions(-)
> 
> diff --git a/src/cli/context.py b/src/cli/context.py
> index cd1fa44..f317962 100644
>@@ -141,6 +142,21 @@ index c408dc9..e43fd09 100644
>            
>            $ list disks --vm-identifier myvm --kwargs "name=Disk 3"
>  
>+diff --git a/src/ovirtcli/infrastructure/context.py b/src/ovirtcli/infrastructure/context.py
>+index 6e34820..9cb5d9c 100644
>+--- a/src/ovirtcli/infrastructure/context.py
>++++ b/src/ovirtcli/infrastructure/context.py
>+@@ -39,8 +39,8 @@ class OvirtCliExecutionContext(ExecutionContext):
>+     REMOTE_ERROR = 10
>+     NOT_FOUND = 11
>+ 
>+-    SDK_MODULE_NAME = "ovirt-engine-sdk-python"
>+-    CLI_MODULE_NAME = "ovirt-shell"
>++    SDK_MODULE_NAME = "rhevm-sdk-python"
>++    CLI_MODULE_NAME = "rhevm-shell"
>+     DEFAULT_VERSION = (0, 0, 0, 0)
>+ 
>+     def __init__(self, args=None, option_parser=None):
> diff --git a/src/ovirtcli/infrastructure/settings.py b/src/ovirtcli/infrastructure/settings.py
> index 4bbc7d9..5d51e87 100644
> --- a/src/ovirtcli/infrastructure/settings.py
>@@ -155,5 +171,5 @@ index 4bbc7d9..5d51e87 100644
>      INTRO = \
>      """Welcome to %s shell""" % PRODUCT
> -- 
>-1.8.5.3
>+1.9.0
> 
>diff --git a/rhevm-cli.spec b/rhevm-cli.spec
>index 231423d..36b39a8 100644
>--- a/rhevm-cli.spec
>+++ b/rhevm-cli.spec
>@@ -1,6 +1,6 @@
> Name: rhevm-cli
> Version: 3.4.0.6
>-Release: 3%{?dist}
>+Release: 4%{?dist}
> Summary: RHEV-M Engine Command Line Interface
> Group: Development/Libraries
> License: ASL 2.0
>@@ -62,6 +62,9 @@ popd
> %doc LICENSE
> 
> %changelog
>+* Tue May 13 2014 Juan Hernandez <juan.hernandez@redhat.com> - 3.4.0.6-4
>+- Fix reporting of version numbers in the "info" command #1097331.
>+
> * Wed Mar 26 2014 Juan Hernandez <juan.hernandez@redhat.com> - 3.4.0.6-3
> - Fix branding in help text #1081010.
> 
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1097331: 895170