summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Fenn <fennm@deshawresearch.com>2013-11-05 10:19:10 -0500
committerMichael Fenn <fennm@deshawresearch.com>2013-11-05 10:19:10 -0500
commit639c7b07cac8c0a5fcf55d457a1b5a18c02eb2a3 (patch)
treea91220caf27a9e288015c9eba600868395dd8005 /src
parent0ceb2e76488a3fa4dbbc8cbb537e0366e0f665b2 (diff)
downloadbcfg2-639c7b07cac8c0a5fcf55d457a1b5a18c02eb2a3.tar.gz
bcfg2-639c7b07cac8c0a5fcf55d457a1b5a18c02eb2a3.tar.bz2
bcfg2-639c7b07cac8c0a5fcf55d457a1b5a18c02eb2a3.zip
Admin: Don't call dead Mode.__call__ code
In 9eb3db84, Bcfg2.Server.Admin.Mode.__call__() was changed from pass to raise a NotImplementedError. This causes bcfg2-admin compare and bcfg2-admin snapshots to fail because they call Bcfg2.Server.Admin.Mode.__call__() right away. Since that method didn't do anything anyway, it seems expediant to just avoid the call altogether.
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Admin/Compare.py1
-rw-r--r--src/lib/Bcfg2/Server/Admin/Snapshots.py1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Compare.py b/src/lib/Bcfg2/Server/Admin/Compare.py
index e3648a6d0..d7285284a 100644
--- a/src/lib/Bcfg2/Server/Admin/Compare.py
+++ b/src/lib/Bcfg2/Server/Admin/Compare.py
@@ -115,7 +115,6 @@ class Compare(Bcfg2.Server.Admin.Mode):
return identical
def __call__(self, args):
- Bcfg2.Server.Admin.Mode.__call__(self, args)
if len(args) == 0:
self.errExit("No argument specified.\n"
"Please see bcfg2-admin compare help for usage.")
diff --git a/src/lib/Bcfg2/Server/Admin/Snapshots.py b/src/lib/Bcfg2/Server/Admin/Snapshots.py
index c2d279391..fcb240352 100644
--- a/src/lib/Bcfg2/Server/Admin/Snapshots.py
+++ b/src/lib/Bcfg2/Server/Admin/Snapshots.py
@@ -27,7 +27,6 @@ class Snapshots(Bcfg2.Server.Admin.Mode):
self.cfile = self.configfile
def __call__(self, args):
- Bcfg2.Server.Admin.Mode.__call__(self, args)
if len(args) == 0 or args[0] == '-h':
print(self.__usage__)
raise SystemExit(0)