From: Dan Mick <dan.mick@inktank.com>
Date: Thu, 25 Jul 2013 05:31:17 +0000 (-0700)
Subject: ceph_argparse.py: wrong variable used if valid() fails for Ceph{Osd}Name
X-Git-Tag: v0.67-rc3~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=27a0b86615918dc7ac88e55d2ec3bf1c8f6f6a3a;p=ceph.git

ceph_argparse.py: wrong variable used if valid() fails for Ceph{Osd}Name

self.t isn't valid in the failure case; use t

Signed-off-by: Dan Mick <dan.mick@inktank.com>
---

diff --git a/src/pybind/ceph_argparse.py b/src/pybind/ceph_argparse.py
index 907d2ec2b33f..b82cc833ba66 100644
--- a/src/pybind/ceph_argparse.py
+++ b/src/pybind/ceph_argparse.py
@@ -332,7 +332,7 @@ class CephName(CephArgtype):
         else:
             t, i = s.split('.')
             if not t in ('osd', 'mon', 'client', 'mds'):
-                raise ArgumentValid('unknown type ' + self.t)
+                raise ArgumentValid('unknown type ' + t)
             if t == 'osd':
                 if i != '*':
                     try:
@@ -364,7 +364,7 @@ class CephOsdName(CephArgtype):
             t = 'osd'
             i = s
         if t != 'osd':
-            raise ArgumentValid('unknown type ' + self.t)
+            raise ArgumentValid('unknown type ' + t)
         try:
             i = int(i)
         except: