From 7d6f5ecb563d503dddad144b06722eecde48608e Mon Sep 17 00:00:00 2001
From: Benjamin Drung <bdrung@ubuntu.com>
Date: Sat, 22 Jan 2011 02:25:09 +0100
Subject: [PATCH] *-distro-info: parser.error() will exit.
---
debian-distro-info | 6 +-----
ubuntu-distro-info | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/debian-distro-info b/debian-distro-info
index 026bf3c..cebd9a0 100755
--- a/debian-distro-info
+++ b/debian-distro-info
@@ -56,14 +56,12 @@ def main():
if len(args) != 0:
parser.error("This script does not take any additional parameters.")
- return 1
versions = [options.all, options.devel, options.old, options.stable,
options.supported, options.testing, options.unsupported]
if len([x for x in versions if x]) != 1:
parser.error("You have to select exactly one of --all, --devel, --old, "
"--stable, --supported, --testing, --unsupported.")
- return 1
if options.date is None:
date = None
@@ -73,7 +71,6 @@ def main():
except ValueError:
parser.error("Option --date needs to be an date in ISO 8601 "
"format.")
- return 1
if options.all:
for distro in DebianDistroInfo().all:
@@ -92,7 +89,6 @@ def main():
elif options.unsupported:
for distro in DebianDistroInfo().unsupported(date):
print distro
- return 0
if __name__ == "__main__":
- sys.exit(main())
+ main()
diff --git a/ubuntu-distro-info b/ubuntu-distro-info
index 89d1699..fa5d6aa 100755
--- a/ubuntu-distro-info
+++ b/ubuntu-distro-info
@@ -53,14 +53,12 @@ def main():
if len(args) != 0:
parser.error("This script does not take any additional parameters.")
- return 1
versions = [options.all, options.devel, options.lts, options.stable,
options.supported, options.unsupported]
if len([x for x in versions if x]) != 1:
parser.error("You have to select exactly one of --all, --devel, --lts, "
"--stable, --supported, --unsupported.")
- return 1
if options.date is None:
date = None
@@ -70,7 +68,6 @@ def main():
except ValueError:
parser.error("Option --date needs to be an date in ISO 8601 "
"format.")
- return 1
if options.all:
for distro in UbuntuDistroInfo().all:
@@ -87,7 +84,6 @@ def main():
elif options.unsupported:
for distro in UbuntuDistroInfo().unsupported(date):
print distro
- return 0
if __name__ == "__main__":
- sys.exit(main())
+ main()