From e0c4fd1e416c60ebc07f441f7e6ff7b7feec9e4e Mon Sep 17 00:00:00 2001
From: Benjamin Drung <bdrung@ubuntu.com>
Date: Fri, 8 Jan 2010 19:06:09 +0100
Subject: * moz-version:   - Add parameter for converting Mozilla versions into
 Debian upstream     versions and the other way round.     - update
 man/moz-version.1     - update src/moz_version.py     - update
 src/moz-version

---
 src/moz-version    | 61 ++++++++++++++++++++++++++++++++++++++++--------------
 src/moz_version.py | 33 +++++++++++++++++++++++++----
 2 files changed, 74 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/moz-version b/src/moz-version
index ddf4ac5..cea49b7 100755
--- a/src/moz-version
+++ b/src/moz-version
@@ -21,9 +21,10 @@
 # THE SOFTWARE.
 
 import getopt
+import os
 import sys
 
-from moz_version import compare_versions
+from moz_version import compare_versions, convert_debian_to_moz_version, convert_moz_to_debian_version
 
 # error codes
 COMMAND_LINE_SYNTAX_ERROR = 2
@@ -64,35 +65,48 @@ def moz_version_compare(version1, comparator, version2, silent=False, verbose=Fa
 
 
 def usage(output):
-	print >> output, """Usage: %s --compare version1 comparator version2
+	name = os.path.basename(sys.argv[0])
+	print >> output, """Usage: %s [options] action
 
-  -h, --help         display this help and exit
-  -s, --silent       do not print anything and die silent on errors
-  -v, --verbose      print more information
+Actions:
+  -c, --compare version1 comparator version2
+                           compare both Mozilla version numbers
+                           comparator must be one of %s
+  -d, --to-deb version     converts Mozilla into a Debian upstream version
+  -m, --to-moz version     converts Debian into a Mozilla version
 
-comparator must be one of %s.""" % (sys.argv[0], ", ".join(comparators))
+Options:
+  -h, --help               display this help and exit
+  -s, --silent             do not print anything and die silent on errors
+  -v, --verbose            print more information
+
+See %s(1) for more info.""" % (name, ", ".join(comparators), name)
 
 
 if __name__ == "__main__":
 	try:
-		long_opts = ["compare", "help", "silent", "verbose"]
-		opts, args = getopt.gnu_getopt(sys.argv[1:], "chsv", long_opts)
+		long_opts = ["compare", "help", "silent", "to-deb", "to-moz", "verbose"]
+		opts, args = getopt.gnu_getopt(sys.argv[1:], "cdhmsv", long_opts)
 	except getopt.GetoptError, e:
 		# print help information and exit:
 		print >> sys.stderr, str(e) # will print something like "option -a not recognized"
 		usage(sys.stderr)
 		sys.exit(COMMAND_LINE_SYNTAX_ERROR)
 
-	compare = False
+	actions = set()
 	silent = False
 	verbose = False
 
 	for o, a in opts:
 		if o in ("-c", "--compare"):
-			compare = True
+			actions.add("compare")
+		elif o in ("-d", "--to-deb"):
+			actions.add("to-deb")
 		elif o in ("-h", "--help"):
 			usage(sys.stdout)
 			sys.exit()
+		elif o in ("-m", "--to-moz"):
+			actions.add("to-moz")
 		elif o in ("-s", "--silent"):
 			silent = True
 		elif o in ("-v", "--verbose"):
@@ -100,7 +114,15 @@ if __name__ == "__main__":
 		else:
 			assert False, "unhandled option"
 
-	if compare:
+	if len(actions) != 1:
+		if not silent:
+			print >> sys.stderr, "E: You must specify an action."
+			usage(sys.stderr)
+		sys.exit(COMMAND_LINE_SYNTAX_ERROR)
+
+	action = actions.pop()
+
+	if action == "compare":
 		if len(args) != 3:
 			if not silent:
 				usage(sys.stderr)
@@ -113,8 +135,15 @@ if __name__ == "__main__":
 			if verbose:
 				print "I: Compare expression false."
 			sys.exit(1)
-	else:
-		if not silent:
-			print >> sys.stderr, "E: You should specify the command --compare."
-			usage(sys.stderr)
-		sys.exit(COMMAND_LINE_SYNTAX_ERROR)
+	elif action == "to-deb":
+		if len(args) != 1:
+			if not silent:
+				print >> sys.stderr, "E: The action --to-deb takes exactly one argument."
+			sys.exit(COMMAND_LINE_SYNTAX_ERROR)
+		print convert_moz_to_debian_version(args[0], 0, verbose)
+	elif action == "to-moz":
+		if len(args) != 1:
+			if not silent:
+				print >> sys.stderr, "E: The action --to-moz takes exactly one argument."
+			sys.exit(COMMAND_LINE_SYNTAX_ERROR)
+		print convert_debian_to_moz_version(args[0], verbose)
diff --git a/src/moz_version.py b/src/moz_version.py
index 832d65f..24c4680 100644
--- a/src/moz_version.py
+++ b/src/moz_version.py
@@ -124,6 +124,17 @@ def extract_upstream_version(debian_version):
 		del parts[-1]
 	upstream_version = '-'.join(parts)
 
+	# remove epoch
+	parts = upstream_version.split(':')
+	if len(parts) > 1:
+		del parts[0]
+	upstream_version = ':'.join(parts)
+
+	return upstream_version
+
+def convert_debian_to_moz_version(debian_version, verbose=False):
+	upstream_version = extract_upstream_version(debian_version)
+
 	# compatibility: strip +nobinonly and +build
 	parts = upstream_version.split('+')
 	if len(parts) > 1 and parts[-1] == "nobinonly":
@@ -132,9 +143,23 @@ def extract_upstream_version(debian_version):
 		del parts[-1]
 	upstream_version = '+'.join(parts)
 
-	return upstream_version
-
-def convert_debian_to_moz_version(debian_version, verbose=False):
-	upstream_version = extract_upstream_version(debian_version)
 	moz_version = upstream_version.replace("~", "")
 	return moz_version
+
+def convert_moz_to_debian_version(moz_version, epoch=0, verbose=False):
+	parts = decode_version(moz_version, verbose)
+	# tranform parts
+	for i in xrange(len(parts)):
+		(number_a, string_b, number_c, string_d) = parts[i]
+		part = ""
+		if string_d != "":
+			part = "~" + string_d
+		if number_c != 0 or string_d != "":
+			part = str(number_c) + part
+		if string_b != "":
+			part = "~" + string_b + part
+		parts[i] = str(number_a) + part
+	debian_version = ".".join(parts)
+	if epoch != 0:
+		debian_version = str(epoch) + ":" + debian_version
+	return debian_version
-- 
cgit v1.2.3