Hello community, here is the log from the commit of package yast2-printer for openSUSE:Factory checked in at 2016-04-11 09:12:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-printer (Old) and /work/SRC/openSUSE:Factory/.yast2-printer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-printer" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-printer/yast2-printer.changes 2015-12-23 09:56:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-printer.new/yast2-printer.changes 2016-04-11 09:12:38.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 4 09:49:41 CEST 2016 - [email protected] + +- Using "uptime" from package yast2 instead of Builtins.time. + Cleanup for bnc#956730. +- 3.1.4 + +------------------------------------------------------------------- Old: ---- yast2-printer-3.1.3.tar.bz2 New: ---- yast2-printer-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.RFJdhz/_old 2016-04-11 09:12:39.000000000 +0200 +++ /var/tmp/diff_new_pack.RFJdhz/_new 2016-04-11 09:12:39.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-printer # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-printer -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,7 +35,7 @@ Requires: /bin/mktemp Requires: /bin/ping Requires: /usr/bin/sed -Requires: yast2 >= 2.16.12 +Requires: yast2 >= 3.1.183 # Used to exclude libX11, libXau, libxcb, and libxcb-xlib from the requires list # which are pulled in by Autoreqprov because of the basicadd_displaytest tool: ++++++ yast2-printer-3.1.3.tar.bz2 -> yast2-printer-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-3.1.3/package/yast2-printer.changes new/yast2-printer-3.1.4/package/yast2-printer.changes --- old/yast2-printer-3.1.3/package/yast2-printer.changes 2015-12-21 16:00:13.000000000 +0100 +++ new/yast2-printer-3.1.4/package/yast2-printer.changes 2016-04-05 11:11:10.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 4 09:49:41 CEST 2016 - [email protected] + +- Using "uptime" from package yast2 instead of Builtins.time. + Cleanup for bnc#956730. +- 3.1.4 + +------------------------------------------------------------------- Mon Dec 21 14:49:19 UTC 2015 - [email protected] - Use the correct RPM Group (System/YaST) (bsc#951817) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-3.1.3/package/yast2-printer.spec new/yast2-printer-3.1.4/package/yast2-printer.spec --- old/yast2-printer-3.1.3/package/yast2-printer.spec 2015-12-21 16:00:13.000000000 +0100 +++ new/yast2-printer-3.1.4/package/yast2-printer.spec 2016-04-05 11:11:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-printer -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,7 +34,7 @@ Recommends: cups-client iptables netcat samba-client Requires: /bin/mktemp /bin/ping /usr/bin/sed -Requires: yast2 >= 2.16.12 +Requires: yast2 >= 3.1.183 # Used to exclude libX11, libXau, libxcb, and libxcb-xlib from the requires list # which are pulled in by Autoreqprov because of the basicadd_displaytest tool: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-3.1.3/src/include/printer/overview.rb new/yast2-printer-3.1.4/src/include/printer/overview.rb --- old/yast2-printer-3.1.3/src/include/printer/overview.rb 2015-12-21 16:00:13.000000000 +0100 +++ new/yast2-printer-3.1.4/src/include/printer/overview.rb 2016-04-05 11:11:10.000000000 +0200 @@ -25,6 +25,9 @@ # Authors: Johannes Meixner <[email protected]> # # $Id: overview.ycp 29363 2006-03-24 08:20:43Z mzugec $ + +require "yast2/system_time" + module Yast module PrinterOverviewInclude def initialize_printer_overview(include_target) @@ -161,10 +164,10 @@ # Determine whether or not it is currently a real client-only config # (i.e. a ServerName != "localhost/127.0.0.1" in /etc/cups/client.conf) # and ignore when it fails (i.e. use the fallback value silently): - time_before = Builtins.time + time_before = Yast2::SystemTime.uptime Printerlib.DetermineClientOnly if Printerlib.client_only - if Ops.greater_than(Ops.subtract(Builtins.time, time_before), 10) + if (Yast2::SystemTime.uptime - time_before) > 10 Builtins.y2milestone( "DetermineClientOnly took longer than 10 seconds. CUPS server is '%1'", Printerlib.client_conf_server_name @@ -259,9 +262,9 @@ end end # Determine whether or not a local cupsd is accessible: - time_before = Builtins.time + time_before = Yast2::SystemTime.uptime if local_cupsd_required && !Printerlib.GetAndSetCupsdStatus("") - if Ops.greater_than(Ops.subtract(Builtins.time, time_before), 10) + if (Yast2::SystemTime.uptime - time_before) > 10 Builtins.y2milestone( "GetAndSetCupsdStatus('') took longer than 10 seconds." )
