summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--setup.py1
-rwxr-xr-xsrc/sbin/bcfg2-admin5
2 files changed, 2 insertions, 4 deletions
diff --git a/setup.py b/setup.py
index 73d17e9d7..fc8e20993 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,6 @@ setup(name="Bcfg2.Server",
"Bcfg2.Server.Plugins",
"Bcfg2.Server.Reports",
"Bcfg2.Server.Reports.reports",
- "Bcfg2.Server.Reports.reports",
"Bcfg2.Server.Reports.reports.templatetags",
"Bcfg2.tlslite",
"Bcfg2.tlslite.utils",
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index d7ad02d3a..d4f30075f 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -27,11 +27,10 @@ if __name__ == '__main__':
print msg
raise SystemExit(1)
- if not args:
- print usage
- raise SystemExit(1)
help = False
+ if not args:
+ help = True
# First get the options...
for opt, arg in opts:
if opt in ("-h", "--help"):