Changeset 8342 in genesis

Timestamp:

Aug 13, 2010, 8:00:18 PM (15 years ago)

Author:

rick

Message:

• genesis-to-yaml.pl wildcard hack

• merge does not need to have initial file

Location:

nodes

Files:

• genesis-to-yaml.pl (modified) (1 diff)
• get-network-status.py (modified) (1 diff)

nodes/genesis-to-yaml.pl

@@ -27 +27 @@
      $output = $file;
      $output =~ s/conf$/yaml/;
-     print `perl $ENV{_} $file > $output`;
+     print "# Processing $file\n";
+     `./genesis-to-yaml.pl $file > $output`;
   }
   exit 0;

nodes/get-network-status.py

@@ -310 +310 @@
 def do_merge(files):
   """ Merge all external statuses in our own nodestatus, using optimistic approch """
-  stream = file(nodemap_status_file,'r')
-  status = yaml.load(stream)
+  try:
+    stream = file(nodemap_status_file,'r')
+    status = yaml.load(stream)
+  except IOError, e:
+    # Data store format used for nodemap generation
+    status = { 'node' : {}, 'link' : {}}
+
   for cfile in files:
     try: