machinery-tool 1.16.3 → 1.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c00eaca55ecc5e08f71d08727977495e8e323a7
-  data.tar.gz: a5fbe828a941ad0d80d00e7fdd3ab6d0faa4e9af
+  metadata.gz: 61f95235d9694179e1978bb89447ee9cda2edf8c
+  data.tar.gz: 41f8b0796dbd7a589e4064913e0bd3aedd90c508
 SHA512:
-  metadata.gz: c4166a79a449b345f5a910c0f6f96058952cd7b609dc999733249f315058b00192e6cffd87f462f3f09d27dc162286925433efb2464a319857cdf542345bf817
-  data.tar.gz: a8ab3cdd686c51759c28fd3361d6729cb7d1012f929656c077454aee5d51924d302641cf5899f093c43c15eb5b9e178efa656a102ac493ae82d62f0d07c273d0
+  metadata.gz: 73e002b842608df16b0b6eecbde9d8471e94006b48ec1986179a7660e32c9b670d36573806f355fe01d0187dc0d975e31ac36ee44ad2bca18c7ea71488230d20
+  data.tar.gz: cf4b647db694d47f6338b66c66819064f89be90e85c663dc0aa3f6731a7ff5958f52f26ea37fc30066a7ac2e6dc7d87d2e4a18d2b17a3d9332a4914970ae5b91

data/.git_revision

@@ -1 +1 @@
-e830c7c80abc78b74a40826ade55255c311f92b2
+493384074f90a69256c6fa174a1e1e05ae5ce219

data/NEWS

@@ -1,6 +1,13 @@
 # Machinery Release Notes
 
 
+## Version 1.16.4 - Thu Jan 14 18:35:47 CET 2016 - thardeck@suse.de
+
+* The unmanaged-files scope filter will not include "/boot" by default anymore.
+  In order to have the same behavior as before run:
+  `machinery inspect --skip-files=/boot`
+* Fix crash during image build on SLES12 SP1 (gh#SUSE/machinery#1828)
+
 ## Version 1.16.3 - Thu Jan 07 17:57:27 CET 2016 - thardeck@suse.de
 
 * Remove concept of "supported systems" in favor of letting Machinery run

data/filters/default_filters.json

@@ -11,7 +11,6 @@
     "/unmanaged_files/files/name=/var/lib/rpm",
     "/unmanaged_files/files/name=/.snapshots",
     "/unmanaged_files/files/name=/proc",
-    "/unmanaged_files/files/name=/boot",
     "/unmanaged_files/files/name=/etc/init.d/boot.d",
     "/unmanaged_files/files/name=/etc/init.d/rc0.d",
     "/unmanaged_files/files/name=/etc/init.d/rc1.d",

data/filters/filter-packages-for-build.yaml

@@ -1,8 +1,3 @@
-# check lib/os.rb for the distribution names
-"openSUSE 13.2 (Harlequin)":
-  - openSUSE-release-dvd
-"openSUSE 13.1 (Bottle)":
-  - openSUSE-release-dvd
-"SUSE Linux Enterprise Server 12":
-  - sle-sdk-release-DVD
-  - sles-release-DVD
+- openSUSE-release-dvd
+- sle-sdk-release-DVD
+- sles-release-DVD

data/html/assets/compare/machinery.js

@@ -22,10 +22,6 @@ $(document).ready(function () {
     }
   });
 
-  $(".dismiss").click(function(){
-    $(this).closest(".scope").hide();
-  });
-
   // Hook up the toggle links
   $(".toggle").click(function(){
     $(this).closest(".scope").find(".scope_content").collapse("toggle");

data/html/assets/machinery-base.js

@@ -17,3 +17,9 @@ function setCurrentScopeState(anchor) {
     anchor.removeClass("over-the-top");
   }
 }
+
+$(document).ready(function () {
+  $(".dismiss").click(function(){
+    $(this).closest(".scope").hide();
+  });
+})

data/lib/kiwi_config.rb

@@ -227,10 +227,9 @@ EOF
   end
 
   def apply_packages(xml)
-    build_filter = YAML.load_file(
+    filter = YAML.load_file(
       File.join(Machinery::ROOT, "filters", "filter-packages-for-build.yaml")
-    )
-    filter = build_filter[@system_description.os.canonical_name] || []
+    ) || []
 
     xml.packages(type: "bootstrap") do
       if @system_description.packages

data/lib/version.rb

@@ -17,6 +17,6 @@
 
 module Machinery
 
-  VERSION = "1.16.3"
+  VERSION = "1.16.4"
 
 end

data/machinery-helper/version.go

@@ -2,4 +2,4 @@
 
 package main
 
-const VERSION = "e830c7c80abc78b74a40826ade55255c311f92b2"
+const VERSION = "493384074f90a69256c6fa174a1e1e05ae5ce219"

data/plugins/os/os_model.rb

@@ -92,6 +92,10 @@ class OsUnknown < Os
 end
 
 class OsSuse < Os
+  def self.canonical_name
+    "SUSE OS"
+  end
+
   def kiwi_bootloader
     "grub2"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: machinery-tool
 version: !ruby/object:Gem::Version
-  version: 1.16.3
+  version: 1.16.4
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cheetah
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: abstract_method
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -142,42 +142,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: mimemagic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ronn
   requirement: !ruby/object:Gem::Requirement