Manually adding --version to argparse in python stub since python 3.3 dropped the version keyword.

6 files changed, 12 insertions, 12 deletions

diff --git a/components/binary_hooks b/components/binary_hooks
index 16a3e81f7..4393d3505 100755
--- a/components/binary_hooks
+++ b/components/binary_hooks
@@ -30,11 +30,11 @@ def main():
 		description     = '''live-build contains the components to build a live system from a configuration directory.
 		                     The binary_hooks command executes hooks after the binary stage.''',
 		epilog          = 'See \'man lb_binary_hooks\' for more information.',
-		version         = 'live-build 4',
 		formatter_class = argparse.ArgumentDefaultsHelpFormatter
 	)
 
-	arguments.add_argument('--verbose',     help='set verbose option',         action='store_true')
+	arguments.add_argument('--version',     help='show program\'s version number and exit', action='version', version='live-build 4')
+	arguments.add_argument('--verbose',     help='set verbose option',                      action='store_true')
 
 	args = arguments.parse_args()
 
diff --git a/components/bootstrap_cdebootstrap b/components/bootstrap_cdebootstrap
index 24eef1d3f..75c7b41bb 100755
--- a/components/bootstrap_cdebootstrap
+++ b/components/bootstrap_cdebootstrap
@@ -32,11 +32,11 @@ def main():
 		description     = '''live-build contains the components to build a live system from a configuration directory.
 		                     The bootstrap_cdebootstrap command bootstraps the chroot system with cdebootstrap.''',
 		epilog          = 'See \'man lb_bootstrap_cdebootstrap\' for more information.',
-		version         = 'live-build 4',
 		formatter_class = argparse.ArgumentDefaultsHelpFormatter
 	)
 
-	arguments.add_argument('--verbose',              help='set verbose option',         action='store_true')
+	arguments.add_argument('--version',              help='show program\'s version number and exit', action='version', version='live-build 4')
+	arguments.add_argument('--verbose',              help='set verbose option',                      action='store_true')
 	arguments.add_argument('--cdebootstrap-options', help='set cdebootstrap(1) options' )
 
 	args = arguments.parse_args()
diff --git a/components/bootstrap_debootstrap b/components/bootstrap_debootstrap
index 00d86c327..74805c6e5 100755
--- a/components/bootstrap_debootstrap
+++ b/components/bootstrap_debootstrap
@@ -32,11 +32,11 @@ def main():
 		description     = '''live-build contains the components to build a live system from a configuration directory.
 		                     The bootstrap_debootstrap command bootstraps the chroot system with debootstrap.''',
 		epilog          = 'See \'man lb_bootstrap_debootstrap\' for more information.',
-		version         = 'live-build 4',
 		formatter_class = argparse.ArgumentDefaultsHelpFormatter
 	)
 
-	arguments.add_argument('--verbose',             help='set verbose option',        action='store_true')
+	arguments.add_argument('--version',             help='show program\'s version number and exit', action='version', version='live-build 4')
+	arguments.add_argument('--verbose',             help='set verbose option',                      action='store_true')
 	arguments.add_argument('--debootstrap-options', help='set debootstrap(8) options' )
 
 	args = arguments.parse_args()
diff --git a/components/bootstrap_hooks b/components/bootstrap_hooks
index 2d6887d58..5162cdb5d 100755
--- a/components/bootstrap_hooks
+++ b/components/bootstrap_hooks
@@ -30,11 +30,11 @@ def main():
 		description     = '''live-build contains the components to build a live system from a configuration directory.
 		                     The bootstrap_hooks command executes hooks after the bootstrap stage.''',
 		epilog          = 'See \'man lb_bootstrap_hooks\' for more information.',
-		version         = 'live-build 4',
 		formatter_class = argparse.ArgumentDefaultsHelpFormatter
 	)
 
-	arguments.add_argument('--verbose',     help='set verbose option',         action='store_true')
+	arguments.add_argument('--version',     help='show program\'s version number and exit', action='version', version='live-build 4')
+	arguments.add_argument('--verbose',     help='set verbose option',                      action='store_true')
 
 	args = arguments.parse_args()
 
diff --git a/components/chroot_hooks b/components/chroot_hooks
index ce2287a57..d27d7ecc7 100755
--- a/components/chroot_hooks
+++ b/components/chroot_hooks
@@ -30,11 +30,11 @@ def main():
 		description     = '''live-build contains the components to build a live system from a configuration directory.
 		                     The chroot_hooks command executes hooks after the chroot stage.''',
 		epilog          = 'See \'man lb_chroot_hooks\' for more information.',
-		version         = 'live-build 4',
 		formatter_class = argparse.ArgumentDefaultsHelpFormatter
 	)
 
-	arguments.add_argument('--verbose',     help='set verbose option',         action='store_true')
+	arguments.add_argument('--version',     help='show program\'s version number and exit', action='version', version='live-build 4')
+	arguments.add_argument('--verbose',     help='set verbose option',                      action='store_true')
 
 	args = arguments.parse_args()
 
diff --git a/components/source_hooks b/components/source_hooks
index d414c424e..baba70c46 100755
--- a/components/source_hooks
+++ b/components/source_hooks
@@ -30,11 +30,11 @@ def main():
 		description     = '''live-build contains the components to build a live system from a configuration directory.
 		                     The source_hooks command executes hooks after the source stage.''',
 		epilog          = 'See \'man lb_source_hooks\' for more information.',
-		version         = 'live-build 4',
 		formatter_class = argparse.ArgumentDefaultsHelpFormatter
 	)
 
-	arguments.add_argument('--verbose',     help='set verbose option',         action='store_true')
+	arguments.add_argument('--version',     help='show program\'s version number and exit', action='version', version='live-build 4')
+	arguments.add_argument('--verbose',     help='set verbose option',                      action='store_true')
 
 	args = arguments.parse_args()