Hello community,
here is the log from the commit of package yast2-online-update-configuration
for openSUSE:Factory checked in at 2013-12-18 19:48:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-online-update-configuration (Old)
and /work/SRC/openSUSE:Factory/.yast2-online-update-configuration.new
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-online-update-configuration"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-online-update-configuration/yast2-online-update-configuration.changes
2013-11-15 14:25:03.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-online-update-configuration.new/yast2-online-update-configuration.changes
2013-12-18 19:48:05.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Dec 17 13:20:40 UTC 2013 - [email protected]
+
+- Add option for using deltarpms during update - FATE#314867
+- 3.1.2
+
+-------------------------------------------------------------------
Old:
----
yast2-online-update-configuration-3.1.1.tar.bz2
New:
----
yast2-online-update-configuration-3.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-online-update-configuration.spec ++++++
--- /var/tmp/diff_new_pack.wLgg2Z/_old 2013-12-18 19:48:06.000000000 +0100
+++ /var/tmp/diff_new_pack.wLgg2Z/_new 2013-12-18 19:48:06.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-online-update-configuration
-Version: 3.1.1
+Version: 3.1.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -34,7 +34,7 @@
BuildRequires: perl-XML-Writer
BuildRequires: update-desktop-files
BuildRequires: yast2 >= 2.17.0
-BuildRequires: yast2-devtools >= 3.0.6
+BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: yast2-packager
BuildRequires: yast2-pkg-bindings >= 2.17.20
BuildRequires: yast2-testsuite
++++++ yast2-online-update-configuration-3.1.1.tar.bz2 ->
yast2-online-update-configuration-3.1.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-online-update-configuration-3.1.1/VERSION
new/yast2-online-update-configuration-3.1.2/VERSION
--- old/yast2-online-update-configuration-3.1.1/VERSION 2013-11-15
13:11:44.000000000 +0100
+++ new/yast2-online-update-configuration-3.1.2/VERSION 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-3.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-3.1.1/package/yast2-online-update-configuration.changes
new/yast2-online-update-configuration-3.1.2/package/yast2-online-update-configuration.changes
---
old/yast2-online-update-configuration-3.1.1/package/yast2-online-update-configuration.changes
2013-11-15 13:11:44.000000000 +0100
+++
new/yast2-online-update-configuration-3.1.2/package/yast2-online-update-configuration.changes
2013-12-17 14:34:08.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Dec 17 13:20:40 UTC 2013 - [email protected]
+
+- Add option for using deltarpms during update - FATE#314867
+- 3.1.2
+
+-------------------------------------------------------------------
Wed Nov 13 15:56:18 UTC 2013 - [email protected]
- Add explicit COPYING file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-3.1.1/package/yast2-online-update-configuration.spec
new/yast2-online-update-configuration-3.1.2/package/yast2-online-update-configuration.spec
---
old/yast2-online-update-configuration-3.1.1/package/yast2-online-update-configuration.spec
2013-11-15 13:11:44.000000000 +0100
+++
new/yast2-online-update-configuration-3.1.2/package/yast2-online-update-configuration.spec
2013-12-17 14:34:08.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-online-update-configuration
-Version: 3.1.1
+Version: 3.1.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -35,7 +35,7 @@
PreReq: %fillup_prereq
BuildRequires: yast2 >= 2.17.0
BuildRequires: perl-XML-Writer update-desktop-files yast2-packager
yast2-testsuite
-BuildRequires: yast2-devtools >= 3.0.6
+BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: yast2-pkg-bindings >= 2.17.20
BuildArch: noarch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-3.1.1/src/autoyast-rnc/online_update_configuration.rnc
new/yast2-online-update-configuration-3.1.2/src/autoyast-rnc/online_update_configuration.rnc
---
old/yast2-online-update-configuration-3.1.1/src/autoyast-rnc/online_update_configuration.rnc
2013-11-15 13:11:44.000000000 +0100
+++
new/yast2-online-update-configuration-3.1.2/src/autoyast-rnc/online_update_configuration.rnc
2013-12-17 14:34:08.000000000 +0100
@@ -2,14 +2,23 @@
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0";
namespace config = "http://www.suse.com/1.0/configns";
-online_update_configuration = element online_update_configuration {
enable_automatic_online_update? & skip_interactive_patches? &
auto_agree_with_licenses? & include_recommends? & update_interval? &
category_filter? }
+online_update_configuration =
+ element online_update_configuration {
+ enable_automatic_online_update? &
+ skip_interactive_patches? &
+ auto_agree_with_licenses? &
+ include_recommends? &
+ update_interval? &
+ category_filter? &
+ use_deltarpm?
+ }
enable_automatic_online_update = element enable_automatic_online_update {
BOOLEAN }
skip_interactive_patches = element skip_interactive_patches { BOOLEAN }
auto_agree_with_licenses = element auto_agree_with_licenses { BOOLEAN }
include_recommends = element include_recommends { BOOLEAN }
+use_deltarpm = element use_deltarpm { BOOLEAN }
update_interval = element update_interval { text }
-
category_filter = element category_filter { LIST, category* }
category = element category { text }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-3.1.1/src/clients/online_update_configuration.rb
new/yast2-online-update-configuration-3.1.2/src/clients/online_update_configuration.rb
---
old/yast2-online-update-configuration-3.1.1/src/clients/online_update_configuration.rb
2013-11-15 13:11:44.000000000 +0100
+++
new/yast2-online-update-configuration-3.1.2/src/clients/online_update_configuration.rb
2013-12-17 14:34:08.000000000 +0100
@@ -149,6 +149,13 @@
:Value,
OnlineUpdateConfiguration.includeRecommends
)
+
+ UI.ChangeWidget(
+ Id(:use_deltarpm),
+ :Value,
+ OnlineUpdateConfiguration.use_deltarpm
+ )
+
UI.ChangeWidget(
Id(:category),
:Value,
@@ -179,6 +186,9 @@
OnlineUpdateConfiguration.includeRecommends = Convert.to_boolean(
UI.QueryWidget(Id(:includeRecommends), :Value)
)
+
+ OnlineUpdateConfiguration.use_deltarpm =
UI.QueryWidget(Id(:use_deltarpm), :Value)
+
OnlineUpdateConfiguration.enableAOU = Convert.to_boolean(
UI.QueryWidget(Id(:automaticOnlineUpdate), :Value)
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-3.1.1/src/clients/online_update_configuration_auto.rb
new/yast2-online-update-configuration-3.1.2/src/clients/online_update_configuration_auto.rb
---
old/yast2-online-update-configuration-3.1.1/src/clients/online_update_configuration_auto.rb
2013-11-15 13:11:44.000000000 +0100
+++
new/yast2-online-update-configuration-3.1.2/src/clients/online_update_configuration_auto.rb
2013-12-17 14:34:08.000000000 +0100
@@ -115,7 +115,7 @@
Builtins.y2milestone("online_update_configuration_auto finished")
Builtins.y2milestone("----------------------------------------")
- deep_copy(@ret)
+ deep_copy(@ret)
# EOF
end
@@ -197,6 +197,11 @@
OnlineUpdateConfiguration.includeRecommends ? @enabledMsg :
@disabledMsg
)
+ summary = Summary.AddHeader(summary, @use_deltarpm)
+ summary = Summary.AddLine(
+ summary,
+ OnlineUpdateConfiguration.use_deltarpm ? @enabledMsg : @disabledMsg
+ )
summary = Summary.AddHeader(summary, @filterByCategory)
summary = Summary.AddLine(
summary,
@@ -253,6 +258,11 @@
OnlineUpdateConfiguration.includeRecommends
)
UI.ChangeWidget(
+ Id(:use_deltarpm),
+ :Value,
+ OnlineUpdateConfiguration.use_deltarpm
+ )
+ UI.ChangeWidget(
Id(:category),
:Value,
Ops.greater_than(
@@ -284,6 +294,7 @@
OnlineUpdateConfiguration.includeRecommends = Convert.to_boolean(
UI.QueryWidget(Id(:includeRecommends), :Value)
)
+ OnlineUpdateConfiguration.use_deltarpm =
UI.QueryWidget(Id(:use_deltarpm), :Value)
# reset categories to disable the filter
catFilter = Convert.to_boolean(UI.QueryWidget(Id(:category), :Value))
OnlineUpdateConfiguration.currentCategories = [] if !catFilter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-3.1.1/src/include/online-update-configuration/OUCDialogs.rb
new/yast2-online-update-configuration-3.1.2/src/include/online-update-configuration/OUCDialogs.rb
---
old/yast2-online-update-configuration-3.1.1/src/include/online-update-configuration/OUCDialogs.rb
2013-11-15 13:11:44.000000000 +0100
+++
new/yast2-online-update-configuration-3.1.2/src/include/online-update-configuration/OUCDialogs.rb
2013-12-17 14:34:08.000000000 +0100
@@ -69,6 +69,7 @@
@skipInteractivePatches = _("Skip Interactive Patches")
@autoAgreeWithLicenses = _("Agree with Licenses")
@includeRecommends = _("Include Recommended Packages")
+ @use_deltarpm = _("Use delta rpms")
@currentUpdateRepo = _("Current Update Repository:")
@needToRegister = _(
"In order to add the default update repository\nyou have to register
this product."
@@ -212,6 +213,14 @@
OnlineUpdateConfiguration.includeRecommends == true ? true
: false
)
),
+ VSpacing(0.2),
+ Left(
+ CheckBox(
+ Id(:use_deltarpm),
+ @use_deltarpm,
+ OnlineUpdateConfiguration.use_deltarpm
+ )
+ ),
VSpacing(0.8),
CheckBoxFrame(
Id(:category),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-3.1.1/src/lib/online-update-configuration/zypp_config.rb
new/yast2-online-update-configuration-3.1.2/src/lib/online-update-configuration/zypp_config.rb
---
old/yast2-online-update-configuration-3.1.1/src/lib/online-update-configuration/zypp_config.rb
1970-01-01 01:00:00.000000000 +0100
+++
new/yast2-online-update-configuration-3.1.2/src/lib/online-update-configuration/zypp_config.rb
2013-12-17 14:34:08.000000000 +0100
@@ -0,0 +1,36 @@
+class ZyppConfig
+ CONFIG_USE_DELTARPM =
Yast::Path.new(".etc.zypp_conf.value.main.\"download.use_deltarpm\"")
+
+ def initialize
+ # Default config for delta rpms in /etc/zypp/zypp.conf is true
+ @use_deltarpm = true
+ current_config = get_delta_rpm_config_value
+ # Libzypp accepts a variety of 'false' option values
+ @use_deltarpm = !['0', 'no', 'false', 'off',
'-'].include?(current_config.downcase) if current_config
+ end
+
+ def use_deltarpm?
+ @use_deltarpm
+ end
+
+ def activate_deltarpm
+ Yast::Builtins.y2milestone("Activating delta rpms for online update..")
+ set_delta_rpm_config_value(true)
+ end
+
+ def deactivate_deltarpm
+ Yast::Builtins.y2milestone("Deactivating delta rpms for online update..")
+ set_delta_rpm_config_value(false)
+ end
+
+ private
+
+ def set_delta_rpm_config_value new_value
+ return if new_value == use_deltarpm?
+ Yast::SCR.Write(CONFIG_USE_DELTA_RPM, new_value)
+ end
+
+ def get_delta_rpm_config_value
+ Yast::SCR.Read(CONFIG_USE_DELTA_RPM)
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-3.1.1/src/modules/OnlineUpdateConfiguration.rb
new/yast2-online-update-configuration-3.1.2/src/modules/OnlineUpdateConfiguration.rb
---
old/yast2-online-update-configuration-3.1.1/src/modules/OnlineUpdateConfiguration.rb
2013-11-15 13:11:44.000000000 +0100
+++
new/yast2-online-update-configuration-3.1.2/src/modules/OnlineUpdateConfiguration.rb
2013-12-17 14:34:08.000000000 +0100
@@ -28,9 +28,12 @@
#
# $Id: OnlineUpdateConfiguration.ycp 1 2008-09-10 09:45:05Z jdsn $
require "yast"
+require "online-update-configuration/zypp_config"
module Yast
class OnlineUpdateConfigurationClass < Module
+ attr_reader :zypp_config
+
def main
Yast.import "Pkg"
@@ -39,12 +42,13 @@
textdomain "online-update-configuration"
-
+ @zypp_config = ZyppConfig.new
@enableAOU = false
@skipInteractivePatches = true
@autoAgreeWithLicenses = false
@includeRecommends = false
+ @use_deltarpm = zypp_config.use_deltarpm?
@updateInterval = :weekly
@currentCategories = []
@OUCmodified = false
@@ -546,6 +550,7 @@
path(".sysconfig.automatic_online_update.AOU_PATCH_CATEGORIES")
)
)
+
@currentCategories = Builtins.splitstring(patchCategories, " ")
@currentCategories = Builtins.filter(@currentCategories) do |s|
s != nil && s != ""
@@ -582,6 +587,7 @@
"include_recommends",
@includeRecommends
)
+ @use_deltarpm = settings.fetch('use_deltarpm', @use_deltarpm)
@currentCategories = Convert.convert(
Ops.get(settings, ["category_filter", "category"], @currentCategories),
:from => "any",
@@ -617,6 +623,7 @@
path(".sysconfig.automatic_online_update.AOU_INCLUDE_RECOMMENDS"),
@includeRecommends == true ? "true" : "false"
)
+ @use_deltarpm ? zypp_config.activate_deltarpm :
zypp_config.deactivate_deltarpm
catConf = ""
if Ops.greater_than(Builtins.size(@currentCategories), 0)
catConf = Builtins.mergestring(@currentCategories, " ")
@@ -653,6 +660,7 @@
"skip_interactive_patches" => @skipInteractivePatches,
"auto_agree_with_licenses" => @autoAgreeWithLicenses,
"include_recommends" => @includeRecommends,
+ "use_deltarpm" => @use_deltarpm,
"update_interval" => intervalSymbolToString(
@updateInterval,
:name
@@ -665,6 +673,7 @@
publish :variable => :skipInteractivePatches, :type => "boolean"
publish :variable => :autoAgreeWithLicenses, :type => "boolean"
publish :variable => :includeRecommends, :type => "boolean"
+ publish :variable => :use_deltarpm, :type => "boolean"
publish :variable => :updateInterval, :type => "symbol"
publish :variable => :currentCategories, :type => "list <string>"
publish :variable => :OUCmodified, :type => "boolean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-3.1.1/test/test_helper.rb
new/yast2-online-update-configuration-3.1.2/test/test_helper.rb
--- old/yast2-online-update-configuration-3.1.1/test/test_helper.rb
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-online-update-configuration-3.1.2/test/test_helper.rb
2013-12-17 14:34:08.000000000 +0100
@@ -0,0 +1,6 @@
+require 'rspec'
+
+ENV["Y2DIR"] = File.expand_path("../../src", __FILE__)
+
+require 'yast'
+require 'online-update-configuration/zypp_config'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-3.1.1/test/zypp_config_test.rb
new/yast2-online-update-configuration-3.1.2/test/zypp_config_test.rb
--- old/yast2-online-update-configuration-3.1.1/test/zypp_config_test.rb
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-online-update-configuration-3.1.2/test/zypp_config_test.rb
2013-12-17 14:34:08.000000000 +0100
@@ -0,0 +1,54 @@
+#!/usr/bin/env rspec
+
+require_relative 'test_helper'
+
+describe ZyppConfig do
+ describe "#use_deltarpm?" do
+ it "returns true if explicitly activated" do
+
ZyppConfig.any_instance.stub(:get_delta_rpm_config_value).and_return('true')
+ expect(ZyppConfig.new.use_deltarpm?).to eq(true)
+
+
ZyppConfig.any_instance.stub(:get_delta_rpm_config_value).and_return('yes')
+ expect(ZyppConfig.new.use_deltarpm?).to eq(true)
+
+ ZyppConfig.any_instance.stub(:get_delta_rpm_config_value).and_return('1')
+ expect(ZyppConfig.new.use_deltarpm?).to eq(true)
+ end
+
+ it "returns true if using default configuration" do
+ ZyppConfig.any_instance.stub(:get_delta_rpm_config_value).and_return(nil)
+ expect(ZyppConfig.new.use_deltarpm?).to eq(true)
+ end
+
+ it "returns false if explicitly deactivated" do
+
ZyppConfig.any_instance.stub(:get_delta_rpm_config_value).and_return('false')
+ expect(ZyppConfig.new.use_deltarpm?).to eq(false)
+
+
ZyppConfig.any_instance.stub(:get_delta_rpm_config_value).and_return('no')
+ expect(ZyppConfig.new.use_deltarpm?).to eq(false)
+
+ ZyppConfig.any_instance.stub(:get_delta_rpm_config_value).and_return('0')
+ expect(ZyppConfig.new.use_deltarpm?).to eq(false)
+ end
+ end
+
+ describe "#activate_deltarpm" do
+ it "activates delta rpm option in zypp config" do
+ ZyppConfig.any_instance.stub(:get_delta_rpm_config_value)
+ ZyppConfig.any_instance.stub(:set_delta_rpm_config_value)
+ config = ZyppConfig.new
+ expect(config).to receive(:set_delta_rpm_config_value).with(true)
+ expect(config.activate_deltarpm)
+ end
+ end
+
+ describe "#deactivate_deltarpm" do
+ it "deactivates delta rpm option in zypp config" do
+ ZyppConfig.any_instance.stub(:get_delta_rpm_config_value)
+ ZyppConfig.any_instance.stub(:set_delta_rpm_config_value)
+ config = ZyppConfig.new
+ expect(config).to receive(:set_delta_rpm_config_value).with(false)
+ expect(config.deactivate_deltarpm)
+ end
+ end
+end
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
