[PATCH 24/37] Simplify targetcli version command

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Proper versioning of dependencies should be enforced by package manager,
so we don't need those listed here.

Remove warning on version = 'GIT_VERSION'

Signed-off-by: Andy Grover <agrover@xxxxxxxxxx>
---
 targetcli/__init__.py |    2 +-
 targetcli/ui_root.py  |   14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/targetcli/__init__.py b/targetcli/__init__.py
index 12abd31..c3dd63b 100644
--- a/targetcli/__init__.py
+++ b/targetcli/__init__.py
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from ui_root import UIRoot
 
-__version__ = 'GIT_VERSION'
+__version__ = "2.0rc1.fb2"
 __author__ = "Jerome Martin <jxm@xxxxxxxxxxxxxxxxxxxxx>"
 __url__ = "http://www.risingtidesystems.com";
 __description__ = "An administration shell for RTS storage targets."
diff --git a/targetcli/ui_root.py b/targetcli/ui_root.py
index 487984c..80181c6 100644
--- a/targetcli/ui_root.py
+++ b/targetcli/ui_root.py
@@ -131,18 +131,6 @@ class UIRoot(UINode):
         '''
         Displays the targetcli and support libraries versions.
         '''
-        from rtslib import __version__ as rtslib_version
         from targetcli import __version__ as targetcli_version
-        from configshell import __version__ as configshell_version
-        for package, version in dict(targetcli=targetcli_version,
-                                     rtslib=rtslib_version,
-                                     configshell=configshell_version).items():
-            if version == 'GIT_VERSION':
-                self.shell.log.error("Cannot find %s version. The %s package "
-                                     % (package, package)
-                                     + "has probably not been built properly "
-                                     + "from either the git repository or a "
-                                     + "public tarball.")
-            else:
-                self.shell.log.info("Using %s version %s" % (package, version))
+        self.shell.log.info("targetcli version %s" % targetcli_version)
 
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux SCSI]     [Kernel Newbies]     [Linux SCSI Target Infrastructure]     [Share Photos]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Linux IIO]     [Device Mapper]

  Powered by Linux