kiwi_config.rb in machinery-tool-1.4.0

- old
+ new

@@ -1,6 +1,6 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
@@ -15,12 +15,14 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
 class KiwiConfig < Exporter
   attr_accessor :xml, :sh
+  attr_accessor :name
 
   def initialize(system_description, options = {})
+    @name = "kiwi"
     @system_description = system_description
     @options = options
 
     @system_description.assert_scopes(
       "repositories",
@@ -103,11 +105,11 @@
     end
 
     unmanaged_files_path = @system_description.
       scope_file_store("unmanaged_files").path
     if unmanaged_files_path
-      filter = "unmanaged_files_build_excludes"
+      filter = "unmanaged_files_#{@name}_excludes"
       destination = File.join(output_location, "root", "tmp")
       FileUtils.mkdir_p(destination, mode: 01777)
       FileUtils.cp_r(unmanaged_files_path, destination)
       FileUtils.cp(
         File.join(Machinery::ROOT, "export_helpers/#{filter}"),
@@ -155,11 +157,11 @@
       when OsSles11
         boot = "vmxboot/suse-SLES11"
         bootloader = "grub"
       else
         raise Machinery::Errors::ExportFailed.new(
-          "Building is not possible because the operating system " \
-          "'#{@system_description.os.canonical_name}' is not supported."
+          "Export is not possible because the operating system " \
+          "'#{@system_description.os.display_name}' is not supported."
         )
     end
 
     builder = Nokogiri::XML::Builder.new do |xml|
       xml.image(schemaversion: "5.8", name: @system_description.name) do