Changeset b10375f for fedd

Timestamp:

May 25, 2010 9:25:58 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

75720ab

Parents:

d38ff56

Message:

parse services from file

File:

• fedd/fedd_create.py (modified) (4 diffs)

fedd/fedd_create.py

@@ -2 +2 @@
 
 import sys
+import re
 
 from federation.remote_service import service_caller
@@ -74 +75 @@
 
 # Main line
+service_re = re.compile('^\\s*#\\s*SERVICE:\\s*([\\S]+)')
 parser = fedd_create_opts()
 (opts, args) = parser.parse_args()
@@ -82 +84 @@
 if opts.file:
     try:
-        exp_desc = "".join([ line for line in open(opts.file, 'r')])
+        lines = [ line for line in open(opts.file, 'r')]
+        exp_desc = "".join(lines)
     except EnvironmentError:
         sys.exit("Cannot read description file (%s)" %opts.file)
@@ -95 +98 @@
     svcs.append(project_export_service(opts.master, opts.project))
 svcs.extend([ parse_service(s) for s in opts.service])
+# Parse all the strings that we can pull out of the file using the service_re.
+svcs.extend([parse_service(service_re.match(l).group(1)) \
+        for l in lines if service_re.match(l)])
+
 if not svcs:
     print >>sys.stderr, "Warning:Neither master/project nor services requested"