From 5d6b60af2629231cc02bbcb3d169365518c17353 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Fri, 28 Dec 2012 00:52:13 +0100
Subject: [PATCH] Added extra root option for build().

---
 app/models/package.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/models/package.rb b/app/models/package.rb
index b78f3d3ba..19bc42861 100644
--- a/app/models/package.rb
+++ b/app/models/package.rb
@@ -5,7 +5,7 @@ class Package < ApplicationModel
   def self.build(data)
 
     if data[:file]
-      xml     = self._read_file( data[:file], true )
+      xml     = self._read_file( data[:file], data[:root] || true )
       package = self._parse(xml)
     elsif data[:string]
       package = self._parse( data[:string] )
@@ -20,7 +20,7 @@ class Package < ApplicationModel
     package.root.insert_after( '//zpm/description', build_host )
     package.elements.each('zpm/filelist/file') do |element|
       location = element.attributes['location']
-      content = self._read_file(location)
+      content = self._read_file( location, data[:root] )
       base64  = Base64.encode64(content)
       element.text = base64
     end
@@ -165,10 +165,12 @@ class Package < ApplicationModel
   end
 
   def self._read_file(file, fullpath = false)
-    if !fullpath
+    if fullpath == false
       location = @@root + '/' + file
-    else
+    elsif fullpath == true
       location = file
+    else
+      location = fullpath + '/' + file
     end
 
     begin