location-exporter: Uncomment accidentially commented line

[people/ms/libloc.git] / src / python / location-exporter.in

diff --git a/src/python/location-exporter.in b/src/python/location-exporter.in
index 28f761aa5055996cc4da0e4556abf6fb898ee88c..421ed028456ce676f116b38e5934edf0d0563a16 100644 (file)
--- a/src/python/location-exporter.in
+++ b/src/python/location-exporter.in
@@ -123,7 +123,7 @@ class IpsetOutputWriter(OutputWriter):
        suffix = "ipset"
 
        def _write_header(self, f):
-               h = "create %s hash:net family inet hashsize 1024 maxelem 65536" % self.name
+               h = "create %s hash:net family inet hashsize 1024 maxelem 65536\n" % self.name
 
                f.write(h.encode("ascii"))
 
@@ -237,7 +237,7 @@ class CLI(object):
 
                # format
                parser.add_argument("--format", help=_("Output format"),
-                       )#default="list", choices=self.output_formats.keys())
+                       default="list", choices=self.output_formats.keys())
 
                # directory
                parser.add_argument("--directory", help=_("Output directory"), required=True)
@@ -280,12 +280,12 @@ class CLI(object):
 
                                asns.append(object)
 
-                       elif not len(object) == 2:
-                               log.error("Invalid argument: %s" % object)
-                               return 2
+                       elif location.country_code_is_valid(object):
+                               countries.append(object)
 
                        else:
-                               countries.append(object)
+                               log.error("Invalid argument: %s" % object)
+                               return 2
 
                # Open the database
                try: