Script 'mail_helper' called by ro
Hello packager,
This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.
Here comes the log...
---------------------------%<------------------------------
Hi,
here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2 -> sle12
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2/yast2.changes 2014-02-05 17:47:16.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2/yast2.changes 2014-02-10 16:10:33.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Feb 10 13:18:52 UTC 2014 - lslezak@suse.cz
+
+- added memory detection code (gh#yast/yast-packager#33)
+- 3.1.19
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2
- at least 66 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2 (Old)
and /mounts/work_src_done/SLE12/yast2 (BS:build ID:32225 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2", Maintainer is "yast-commit@opensuse.org"
Old:
----
yast2-3.1.18.tar.bz2
New:
----
yast2-3.1.19.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.Y3uqyN/_old 2014-02-11 18:18:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Y3uqyN/_new 2014-02-11 18:18:25.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2
-Version: 3.1.18
+Version: 3.1.19
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -208,6 +208,7 @@
%{yast_ydatadir}/*.ycp
%{yast_clientdir}/*
%{yast_moduledir}/*
+%{yast_libdir}/*
%{yast_scrconfdir}/*
%{yast_ybindir}/*
%{yast_agentdir}/ag_*
++++++ yast2-3.1.18.tar.bz2 -> yast2-3.1.19.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.18/library/system/src/Makefile.am new/yast2-3.1.19/library/system/src/Makefile.am
--- old/yast2-3.1.18/library/system/src/Makefile.am 2014-02-05 14:11:52.000000000 +0100
+++ new/yast2-3.1.19/library/system/src/Makefile.am 2014-02-10 16:05:29.000000000 +0100
@@ -27,6 +27,11 @@
desktop_DATA = \
desktop/messages.desktop
-EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(desktop_DATA)
+ylibdir = @ylibdir@/yast2
+ylib_DATA = \
+ lib/yast2/hw_detection.rb
-include $(top_srcdir)/Makefile.am.common
\ No newline at end of file
+
+EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(desktop_DATA) $(ylib_DATA)
+
+include $(top_srcdir)/Makefile.am.common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.18/library/system/src/lib/yast2/hw_detection.rb new/yast2-3.1.19/library/system/src/lib/yast2/hw_detection.rb
--- old/yast2-3.1.18/library/system/src/lib/yast2/hw_detection.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-3.1.19/library/system/src/lib/yast2/hw_detection.rb 2014-02-10 16:05:29.000000000 +0100
@@ -0,0 +1,65 @@
+# encoding: utf-8
+
+# ***************************************************************************
+#
+# Copyright (c) 2014 SUSE LLC
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
+#
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
+#
+# ***************************************************************************
+# File: hw_detection.rb
+#
+# Authors:
+# Ladislav Slezak
+#
+# Summary:
+# Module for detecting hardware
+#
+
+require "yast"
+
+module Yast2
+ class HwDetection
+ include Yast::Logger
+
+ # this is from include (in hwinfo-devel)
+ MEMORY_CLASS = 257 # "bc_internal" value
+ MEMORY_SUBCLASS = 2 # "sc_int_main_mem" value
+
+ # Return size of the system memory (in bytes)
+ # @return Fixnum,Bignum detected memory size
+ def self.memory
+ memory = SCR.Read(path(".probe.memory"))
+ log.debug("hwinfo memory: #{memory}")
+
+ raise "Memory detection failed" unless memory
+
+ memory_size = 0
+ memory.each do |info|
+ # internal class, main memory
+ if info["class_id"] == MEMORY_CLASS && info["sub_class_id"] == MEMORY_SUBCLASS
+ info.fetch("resource", {}).fetch("phys_mem", []).each do |phys_mem|
+ memory_size += phys_mem.fetch("range", 0)
+ end
+ end
+ end
+
+ log.info("Detected memory size: #{memory_size} (#{memory_size/1024/1024}MiB)")
+ return memory_size
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.18/library/system/test/hw_detection_test.rb new/yast2-3.1.19/library/system/test/hw_detection_test.rb
--- old/yast2-3.1.18/library/system/test/hw_detection_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-3.1.19/library/system/test/hw_detection_test.rb 2014-02-10 16:05:29.000000000 +0100
@@ -0,0 +1,56 @@
+#! /usr/bin/rspec
+
+require "yast"
+include Yast
+
+require_relative "../src/lib/yast2/hw_detection"
+
+describe "HwDetection" do
+ before do
+ # 16GB
+ @ramsize = 16*1024*1024*1024
+ @memory = {
+ "bus" => "None",
+ "bus_hwcfg" => "none",
+ "class_id" => 257,
+ "model" => "Main Memory",
+ "old_unique_key" => "4srm.CxwsZFjVASF",
+ "resource" => {
+ "mem" => [{"active" => true, "length" => 16815341568, "start" => 0}],
+ "phys_mem" => [{"range" => @ramsize}]
+ },
+ "sub_class_id" => 2,
+ "unique_key" => "rdCR.CxwsZFjVASF"
+ }
+ @non_memory = {
+ "class_id" => 42,
+ "sub_class_id" => 42,
+ "resource" => {
+ "mem" => [{"active" => true, "length" => 16815341568, "start" => 0}],
+ "phys_mem" => [{"range" => @ramsize}]
+ }
+ }
+ end
+
+ describe "#memory" do
+ it "returns detected memory size in bytes" do
+ SCR.should_receive(:Read).with(path(".probe.memory")).and_return([@memory])
+ expect(Yast2::HwDetection.memory).to eq(@ramsize)
+ end
+
+ it "sums detected memory sizes" do
+ SCR.should_receive(:Read).with(path(".probe.memory")).and_return([@memory, @memory])
+ expect(Yast2::HwDetection.memory).to eq(2*@ramsize)
+ end
+
+ it "ignores non-memory devices" do
+ SCR.should_receive(:Read).with(path(".probe.memory")).and_return([@memory, @non_memory])
+ expect(Yast2::HwDetection.memory).to eq(@ramsize)
+ end
+
+ it "raises exception when detection fails" do
+ SCR.should_receive(:Read).with(path(".probe.memory")).and_return(nil)
+ expect{Yast2::HwDetection.memory}.to raise_error
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.18/package/yast2.changes new/yast2-3.1.19/package/yast2.changes
--- old/yast2-3.1.18/package/yast2.changes 2014-02-05 14:11:52.000000000 +0100
+++ new/yast2-3.1.19/package/yast2.changes 2014-02-10 16:05:29.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Feb 10 13:18:52 UTC 2014 - lslezak@suse.cz
+
+- added memory detection code (gh#yast/yast-packager#33)
+- 3.1.19
+
+-------------------------------------------------------------------
Wed Feb 5 11:26:09 CET 2014 - jsuchome@suse.cz
- Check for Chef outside in the yast2 shell script to catch modules
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.18/package/yast2.spec new/yast2-3.1.19/package/yast2.spec
--- old/yast2-3.1.18/package/yast2.spec 2014-02-05 14:11:52.000000000 +0100
+++ new/yast2-3.1.19/package/yast2.spec 2014-02-10 16:05:29.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2
-Version: 3.1.18
+Version: 3.1.19
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -208,6 +208,7 @@
%{yast_ydatadir}/*.ycp
%{yast_clientdir}/*
%{yast_moduledir}/*
+%{yast_libdir}/*
%{yast_scrconfdir}/*
%{yast_ybindir}/*
%{yast_agentdir}/ag_*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.18/scripts/save_y2logs new/yast2-3.1.19/scripts/save_y2logs
--- old/yast2-3.1.18/scripts/save_y2logs 2014-02-05 14:11:52.000000000 +0100
+++ new/yast2-3.1.19/scripts/save_y2logs 2014-02-10 16:05:29.000000000 +0100
@@ -71,6 +71,10 @@
LIST="$LIST /etc/X11/xorg.conf"
fi
+if [ -f /etc/X11/xorg.conf.install ]; then
+ LIST="$LIST /etc/X11/xorg.conf.install"
+fi
+
if [ -f /var/log/Xorg.0.log ]; then
LIST="$LIST /var/log/Xorg.0.log"
fi
continue with "q"...
Checked in at Tue Feb 11 18:19:59 CET 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org