#############################################################################
+class ExternalOverrideReader(object):
+ """
+ Parses an external override file
+ """
+ def __init__(self, fh):
+ self.fh = fh
+ self.package = None
+ self.key = None
+ self.value = []
+
+ def _flush(self):
+ """
+ Return the parsed line that is being built and start parsing a new line
+ """
+ res = self.package, self.key, "\n".join(self.value)
+ self.package = self.key = None
+ self.value = []
+ return res
+
+ def __iter__(self):
+ """
+ returns a (package, key, value) tuple for every entry in the external
+ override file
+ """
+ for line in self.fh:
+ if not line: continue
+ if line[0] in (" ", "\t"):
+ # Continuation line
+ self.value.append(line.rstrip())
+ else:
+ if self.package is not None:
+ yield self._flush()
+
+ # New line
+ (self.package, self.key, value) = line.rstrip().split(None, 2)
+ self.value = [value]
+
+ if self.package is not None:
+ yield self._flush()
+
+#############################################################################
+
def external_overrides_copy(from_suite_name, to_suite_name, force = False):
session = DBConn().session()
session.query(ExternalOverride).filter_by(suite=suite,component=component,key=key).delete()
- for line in file:
- (package, key, value) = line.strip().split(None, 2)
+ for package, key, value in ExternalOverrideReader(file):
eo = ExternalOverride()
eo.suite = suite
eo.component = component
Arguments = [('h',"help","External-Overrides::Options::Help"),
('f','force','External-Overrides::Options::Force')]
- args = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
+ args = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
try:
- Options = cnf.SubTree("External-Overrides::Options")
+ Options = cnf.subtree("External-Overrides::Options")
except KeyError:
Options = {}
if Options.has_key("Force") and Options["Force"]:
force = True
- logger = daklog.Logger(cnf, 'external-overrides')
+ logger = daklog.Logger('external-overrides')
command = args[0]
if command in ('import', 'i'):