Merge lp:~james-w/linaro-image-tools/fix-package-regex into lp:linaro-image-tools/11.11

[James Westby]

Hi,

A small change to correct a typo in the name regex that was being
used.

Thanks,

James

[lp:~james-w/linaro-image-tools/fix-package-regex]

141. By James Westby on 2010-09-13

Merged add-other-relations-to-packages-file into fix-package-regex.

[Zygmunt Krynicki (zyga)]

9 + NAME_REGEX = "[a-z0-9][a-z0-9+-.]+$"
                                        ^
This seems wrong:
Look at the part underlined with ^, it is a range expression from '+' to '.'
Is that what you wanted?

review: Needs Information

[James Westby (james-w)]

Good catch, thanks!

It happens to pass the test as "-" is one of the characters
between "+" and "." in ASCII/unicode.

Thanks,

James

[lp:~james-w/linaro-image-tools/fix-package-regex]

142. By James Westby on 2010-09-13

Specify a literal "-" in the regex. Thanks Zygmunt.

[Michael Hudson-Doyle (mwhudson)]

Looks fine. I think I'd double up the backslash or use a r'..' string, but it's not required.

review: Approve

=== modified file 'hwpack/config.py'
--- hwpack/config.py	2010-09-02 19:12:53 +0000
+++ hwpack/config.py	2010-09-13 21:19:07 +0000
@@ -11,7 +11,7 @@
 
     MAIN_SECTION = "hwpack"
     NAME_KEY = "name"
-    NAME_REGEX = "[a-z0-9][a-z0-9+0.]+"
+    NAME_REGEX = "[a-z0-9][a-z0-9+\-.]+$"
     INCLUDE_DEBS_KEY = "include-debs"
     SUPPORT_KEY = "support"
     SOURCES_ENTRY_KEY = "sources-entry"
 
=== modified file 'hwpack/tests/test_config.py'
--- hwpack/tests/test_config.py	2010-09-02 19:08:32 +0000
+++ hwpack/tests/test_config.py	2010-09-13 21:19:07 +0000
@@ -132,6 +132,14 @@
                 + "\n[ubuntu]\nsources-entry = foo bar\n")
         self.assertEqual(None, config.validate())
 
+    def test_validate_valid_config_with_dash_in_package_name(self):
+        config = self.get_config(
+                "[hwpack]\nname = ahwpack\n"
+                "packages = u-boot\n"
+                "architectures = armel\n\n"
+                "[ubuntu]\nsources-entry = foo bar\n")
+        self.assertEqual(None, config.validate())
+
     def test_name(self):
         config = self.get_config(
             "[hwpack]\nname = ahwpack\npackages = foo\n"
 
=== modified file 'hwpack/tests/test_script.py'
--- hwpack/tests/test_script.py	2010-09-13 21:19:07 +0000
+++ hwpack/tests/test_script.py	2010-09-13 21:19:07 +0000
@@ -55,13 +55,17 @@
         self.assertEqual("", stdout)
 
     def test_errors_on_missing_configfile_argument(self):
-        stdout, stderr = self.run_script([], expected_returncode=1)
-        self.assertEqual("Requires arguments CONFIG_FILE VERSION\n", stderr)
+        stdout, stderr = self.run_script([], expected_returncode=2)
+        self.assertEqual(
+            "usage: linaro-hwpack-create [-h] CONFIG_FILE VERSION\n"
+            "linaro-hwpack-create: error: too few arguments\n", stderr)
         self.assertEqual("", stdout)
 
     def test_errors_on_missing_version_argument(self):
-        stdout, stderr = self.run_script(["somefile"], expected_returncode=1)
-        self.assertEqual("Requires arguments CONFIG_FILE VERSION\n", stderr)
+        stdout, stderr = self.run_script(["somefile"], expected_returncode=2)
+        self.assertEqual(
+            "usage: linaro-hwpack-create [-h] CONFIG_FILE VERSION\n"
+            "linaro-hwpack-create: error: too few arguments\n", stderr)
         self.assertEqual("", stdout)
 
     def test_builds_a_hwpack(self):
 
=== modified file 'linaro-hwpack-create'
--- linaro-hwpack-create	2010-09-13 21:19:07 +0000
+++ linaro-hwpack-create	2010-09-13 21:19:07 +0000
@@ -1,19 +1,22 @@
 #!/usr/bin/python
 
-from optparse import OptionParser
+import argparse
 import sys
 
 from hwpack.builder import ConfigFileMissing, HardwarePackBuilder
 
 
 if __name__ == '__main__':
-    parser = OptionParser()
-    opts, args = parser.parse_args()
-    if len(args) < 2:
-        sys.stderr.write("Requires arguments CONFIG_FILE VERSION\n")
-        sys.exit(1)
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "CONFIG_FILE",
+        help="The configuration file to take the hardware pack information "
+        "from.")
+    parser.add_argument(
+        "VERSION", help="The version of the hardware pack to create.")
+    args = parser.parse_args()
     try:
-        builder = HardwarePackBuilder(args[0], args[1])
+        builder = HardwarePackBuilder(args.CONFIG_FILE, args.VERSION)
     except ConfigFileMissing, e:
         sys.stderr.write(str(e) + "\n")
         sys.exit(1)