[elbe-devel] [PATCH 1/3] fix: partitions without a label may raise an exception

[Philipp Rosenberger]

A partition tag without a label tag will cause the following exception:

    Build failed
    Traceback (most recent call last):
      File "/var/cache/elbe/devel/elbepack/asyncworker.py", line 112, in execute
        self.project.build(skip_pkglist=True, build_bin=self.build_bin, build_sources=self.build_src)
      File "/var/cache/elbe/devel/elbepack/elbeproject.py", line 301, in build
        self.targetfs.part_target( self.builddir, grub_version )
      File "/var/cache/elbe/devel/elbepack/efilesystem.py", line 298, in part_target
        self.images = do_hdimg( self.log, self.xml, targetdir, self, grub_version )
      File "/var/cache/elbe/devel/elbepack/hdimg.py", line 463, in do_hdimg
        img = do_image_hd( outf, i, fslabel, target, grub_version )
      File "/var/cache/elbe/devel/elbepack/hdimg.py", line 335, in do_image_hd
        if fslabel.has_key(part.text("label")) and fslabel[part.text("label")].fstype == "vfat":
      File "/var/cache/elbe/devel/elbepack/treeutils.py", line 41, in text
        raise Exception( "Cant find path %s" % path )
    Exception: Cant find path label

    Exception:
    Cant find path label

Now the schema enforces, that a label must be specified inside a partition tag.

Signed-off-by: Philipp Rosenberger <p.rosenberger at linutronix.de>
---
 elbepack/dbsfed.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elbepack/dbsfed.xsd b/elbepack/dbsfed.xsd
index 8582e7c..d608265 100644
--- a/elbepack/dbsfed.xsd
+++ b/elbepack/dbsfed.xsd
@@ -1356,7 +1356,7 @@
           </documentation>
         </annotation>
       </element>
-      <element name="label" type="string" minOccurs="0">
+      <element name="label" type="string" minOccurs="1">
         <annotation>
           <documentation>
              human readable label of the partition used for mount by label and
-- 
2.1.4