[gentoo-commits] proj/portage:master commit in: bin/, pym/portage/util/

[Zac Medico]

commit:     2b4abfec2576c6f50d23dd331827c17aace315b3
Author:     Alexander Berntsen <alexander <AT> plaimi <DOT> net>
AuthorDate: Tue Jul 30 20:15:34 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 22:36:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2b4abfec

bin/fixpackages: Add -h, fixes bug #394773

---
 bin/fixpackages               | 8 ++++++++
 pym/portage/util/_argparse.py | 1 +
 2 files changed, 9 insertions(+)

diff --git a/bin/fixpackages b/bin/fixpackages
index e224b62..e29d6ee 100755
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -14,12 +14,20 @@ import portage
 portage._internal_caller = True
 from portage import os
 from portage.output import EOutput
+from portage.util._argparse import ArgumentParser
 from textwrap import wrap
 from portage._global_updates import _global_updates
 mysettings = portage.settings
 mytrees = portage.db
 mtimedb = portage.mtimedb
 
+description = """The fixpackages program performs package move updates on
+	configuration files, installed packages, and binary packages."""
+description = " ".join(description.split())
+
+parser = ArgumentParser(description=description)
+parser.parse_args()
+
 if mysettings['ROOT'] != "/":
 	out = EOutput()
 	msg = "The fixpackages program is not intended for use with " + \

diff --git a/pym/portage/util/_argparse.py b/pym/portage/util/_argparse.py
index 5e6a9ba..4227f4c 100644
--- a/pym/portage/util/_argparse.py
+++ b/pym/portage/util/_argparse.py
@@ -17,3 +17,4 @@ except ImportError:
 			parser = OptionParser(**kwargs)
 			self.add_argument = parser.add_option
 			self.parse_known_args = parser.parse_args
+			self.parse_args = parser.parse_args