Changeset 1152 for dassmodus


Ignore:
Timestamp:
06/07/13 16:56:02 (8 years ago)
Author:
joergs
Message:

start adapting to Bareos

File:
1 edited

Legend:

Unmodified
Added
Removed
  • dassmodus/trunk/dassmodus/nosferatu/nosferatu/tools/bacsource2configrules.py

    r990 r1152  
    7979
    8080RXP_STRUCT_ITEM = re.compile(r'''
    81     ^\s+{"(?P<name>[^"]+)"\s*,
     81    ^\s+{\s*"(?P<name>[^"]+)"\s*,
    8282    \s*(?P<resitem>[^,]+)\s*(,
    8383    \s*(?P<rcode>[^}]+))?},?\s*(/\*.*\*/)?
     
    122122
    123123RXP_COMMAND_ENTRY = re.compile(r'''
    124 ^\s+{\s+NT_\("(?P<cmdtext>[^"]+)"\),
    125 \s*(?P<cmd>[^"]+),
    126 \s*_\("(?P<usage>[^"]*)"\),
    127 \s+NT_\("(?P<help>[^)]*)"\),
    128 \s*(?P<inrunscript>\w+)}
     124^\s*{\s*NT_\("(?P<cmdtext>[^"]+)"\),
     125\s*(?P<cmd>[^,]+),
     126\s*_\("(?P<usage>[^"]*)"\),\s*\n*
     127\s*NT_\("(?P<help>[^"]*)"\),
     128\s*(?P<inrunscript>\w+)\s*}
    129129''', re.X|re.M|re.S)
    130130
     
    302302            #bl[item["resitem"]].append(item["name"])
    303303            #item.pop('rcode')
    304             bl[item["resitem"]].append(PrettyNames[item.pop('name')])
     304            bl[item["resitem"]].append(prettyName(item.pop('name')))
    305305           
    306306            #print " appended to bl[" ,  item["resitem"] , "]" , item
Note: See TracChangeset for help on using the changeset viewer.