ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/JSOC/localize.py
(Generate patch)

Comparing localize.py (file contents):
Revision 1.20 by arta, Mon Jun 16 16:51:32 2014 UTC vs.
Revision 1.21 by arta, Wed Jul 30 18:31:16 2014 UTC

# Line 545 | Line 545 | def parseConfig(fin, keymap, addenda, de
545                      # Must parse xml and use the project-specific information to populate the Rules.mk and target.mk files.
546                      # Collect all xml lines for now, then process after file-read loop.
547                      if xml is None:
548 <                        xml = line
548 >                        # The first time through this section, line is the config.local div, __PROJ__. Discard that.
549 >                        xml = ''
550 >                        continue
551                      else:
552                          xml += line
553                  else:
# Line 589 | Line 591 | def parseConfig(fin, keymap, addenda, de
591          if not xml is None:
592              # Process xml.
593              projRules.extend(list(RULESPREFIX))
594 <            projTarget.extend(list(TARGETPREFIX))            
594 >            projTarget.extend(list(TARGETPREFIX))
595              rv = processXML(xml, projRules, projTarget)
596              projRules.extend(RULESSUFFIX)
597  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines