modules/flexdata4.py @@ -14,7 +14,7 @@ __license__=""" Distributed under the terms of the GNU General Public License ve redistribute it under certain conditions. See /usr/lib/metro/LICENSE for details. """ __status__="Release" -__version__="1.3" +__version__="1.4.2" def usage(): version() @@ -119,16 +119,7 @@ def main(): for opt,optarg in opts: optdict[opt]=optarg - # Step 1: check for "special" help/version options, handle them and exit: - - if optdict.has_key("-h") or optdict.has_key("--help"): - usage() - sys.exit(1) - elif optdict.has_key("-V") or optdict.has_key("--version"): - version() - sys.exit(1) - - # Step 2: parse optional arguments that affect behavior of the program + # Step 1: parse optional arguments that affect behavior of the program if optdict.has_key("-d") or optdict.has_key("--debug"): debug=True @@ -158,6 +149,16 @@ def main(): # for MetroError: from catalyst_support import MetroError + # Step 2: check for "special" help/version options, handle them and exit: + + if optdict.has_key("-h") or optdict.has_key("--help"): + usage() + sys.exit(1) + elif optdict.has_key("-V") or optdict.has_key("--version"): + version() + sys.exit(1) + + # Step 3: check for duplicate main options, which is an error mainargs=0 @@ -207,9 +208,6 @@ def main(): try: main() -except MetroError: - raise - sys.exit(1) except KeyboardInterrupt: print "\n" + __app__ +" build aborted due to user interrupt (ctrl-C)" print metro @@ -224,12 +224,9 @@ class metroParsedFile: return self.filename def parse(self): - # Using globals isn't always the best programming practice, but in our case of a single-threaded - # parser, it is a handy way to allow various parts of the parser to access relevant information - # without passing arguments all over the place. - - global prevlineno - global lineno + + global endline + global line global curline global filename @@ -355,17 +352,18 @@ class metroParsedFile: self.namespace.add(singleLineElement(self.section,varname," ".join(mysplit[1:])),self.cg) else: raise ParseError("invalid line") -class element: - def __init__(self,section,varname,rawvalue): - global filename - global lineno +class element: + def __init__(self,varname,rawvalue,context): + + self.filename, self.section, self.lineno = context + if varname == ":": # Properly handle $[:] varname = "" - if section != "": - self.varname = section + "/" + varname + if self.section != "": + self.varname = self.section + "/" + varname if self.varname[-1] == "/": self.varname = self.varname[:-1] else: @@ -373,10 +371,6 @@ class element: self.rawvalue = rawvalue - self.filename = filename - self.lineno = lineno - self.section = section - def name(self): return self.varname @@ -385,12 +379,8 @@ class element: class singleLineElement(element): - def __init__(self,section,varname,rawvalue): - element.__init__(self,section,varname,rawvalue) - - def expand(self): - gen = self.getExpansion() - newstring = "" + def __init__(self,varname,rawvalue,context): + element.__init__(self,varname,rawvalue,context) def getExpansion(self): pos = 0 @@ -410,12 +400,12 @@ class singleLineElement(element): yield(rv[found:found2+1]) class multiLineElement(element): - def __init__(self,section,varname,rawvalue): - - global prevlineno + def __init__(self,varname,rawvalue,context): + + self.endline = context[-1] + context = context[:-1] - self.endline = prevlineno - element.__init__(self,section,varname,rawvalue) + element.__init__(self,varname,rawvalue,context) if __name__ == "__main__": coll = metroCollection() modules/flexdata2.py @@ -184,7 +184,7 @@ class metroParsedFile: lineno += 1 mysplit = curline[:-1].strip().split(" ") if len(mysplit) == 1 and mysplit[0] == "]": - self.namespace.add(multiLineElement(self.section,varname,mylines)) + self.namespace.add(multiLineElement(self.section,varname,self.namespace,mylines)) break else: mylines.append(curline) @@ -346,12 +346,14 @@ class singleLineElement(element): class multiLineElement(element): - def __init__(self,section,varname,rawvalue): + def __init__(self,section,varname,namespace,mylines): global prevlineno - + self.lines=mylines self.endline = prevlineno - element.__init__(self,section,varname,rawvalue) + element.__init__(self,section,varname,namespace) + def __repr__(self): + return repr(self.lines) if __name__ == "__main__": coll = collection() modules/flexdata3.py @@ -99,7 +99,7 @@ chroot/run: [ mknod /lib/udev/devices/urandom c 1 9 || exit 10 mknod /lib/udev/devices/random c 1 8 || exit 10 mknod /lib/udev/devices/zero c 1 5 || exit 10 - + # OpenRC - prior to 0.3.0 # cp /etc/rc.conf /etc/rc.conf.orig || exit 11 # cat /etc/rc.conf.orig | sed -e "/^#rc_devices/c\\" -e 'rc_devices="static"' > /etc/rc.conf || exit 12 targets/gentoo/openvz.spec @@ -28,7 +28,7 @@ if [ "$[emerge/packages?]" = "yes" ] then emerge $eopts $[emerge/packages:lax] || exit 1 fi -if [ "$[metro/build]" = "funtoo" ] +if [ "$[metro/build]" = "funtoo" ] || [ "$[metro/build]" = "~funtoo" ] then eselect vi set busybox fi targets/gentoo/stage3.spec 774803242b49c55da9bf67acf31caf17feca33a2 Daniel Robbins drobbins@funtoo.org http://github.com/funtoo/metro/commit/5f69a7ae0215cb244c59bd20a75b0f15c4a6a2df 5f69a7ae0215cb244c59bd20a75b0f15c4a6a2df 2009-07-04T22:10:08-07:00 2009-07-04T22:10:08-07:00 misc small fixes 4211131a2129df72873b6839af39a3844337bada Daniel Robbins drobbins@funtoo.org