From fb57193767a3b52ca6eafda31f2f7e4e33730458 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Mon, 4 Jan 2010 05:44:57 +0100 Subject: Bring back writing of format/subpath/category --- layman/overlays/cvs.py | 11 +++++++++++ layman/overlays/tar.py | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py index a9c4f0f..d2bf5d3 100644 --- a/layman/overlays/cvs.py +++ b/layman/overlays/cvs.py @@ -24,6 +24,8 @@ __version__ = "$Id$" # #------------------------------------------------------------------------------- +import xml.etree.ElementTree as ET # Python 2.5 + from layman.utils import path from layman.overlays.overlay import Overlay @@ -56,6 +58,15 @@ class CvsOverlay(Overlay): def __ne__(self, other): return not self.__eq__(other) + # overrider + def to_xml(self): + repo = super(CvsOverlay, self).to_xml() + if self.subpath: + _subpath = ET.Element('subpath') + _subpath.text = self.subpath + repo.append(_subpath) + return repo + def add(self, base, quiet = False): '''Add overlay.''' diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py index d65befc..05b8581 100644 --- a/layman/overlays/tar.py +++ b/layman/overlays/tar.py @@ -25,6 +25,7 @@ __version__ = "$Id: tar.py 310 2007-04-09 16:30:40Z wrobel $" #------------------------------------------------------------------------------- import os, os.path, sys, urllib2, shutil +import xml.etree.ElementTree as ET # Python 2.5 from layman.utils import path from layman.overlays.overlay import Overlay @@ -98,6 +99,21 @@ class TarOverlay(Overlay): def __ne__(self, other): return not self.__eq__(other) + # overrider + def to_xml(self): + repo = super(TarOverlay, self).to_xml() + if self.format: + repo.find('source').attrib['format'] = self.format + if self.subpath: + _subpath = ET.Element('subpath') + _subpath.text = self.subpath + repo.append(_subpath) + if self.category: + _category = ET.Element('category') + _category.text = self.category + repo.append(_category) + return repo + def add(self, base, quiet = False): '''Add overlay.''' -- cgit v1.2.3-1-g7c22