Hello community,
here is the log from the commit of package yast2-scanner for openSUSE:Factory
checked in at 2015-01-25 21:15:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-scanner (Old)
and /work/SRC/openSUSE:Factory/.yast2-scanner.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-scanner"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-scanner/yast2-scanner.changes
2014-12-05 21:03:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-scanner.new/yast2-scanner.changes
2015-01-25 21:15:51.000000000 +0100
@@ -1,0 +2,14 @@
+Thu Dec 5 17:27:36 CEST 2014 - jsm...@suse.de
+
+- setup_network_scanner_config.with_systemd_support is an
+ enhancement for /usr/lib/YaST2/bin/setup_network_scanner_config
+ that provides additional support for systemd (bnc#859353).
+
+-------------------------------------------------------------------
+Thu Dec 5 16:45:07 CEST 2014 - jsm...@suse.de
+
+- use_fast_append_instead_of_slow_add.diff replaces
+ slow Builtins.add() with fast '<<' append operator
+ where needed to avoid "hang up impression" (bnc#877516).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.jxHUOk/_old 2015-01-25 21:15:52.000000000 +0100
+++ /var/tmp/diff_new_pack.jxHUOk/_new 2015-01-25 21:15:52.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-scanner
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ yast2-scanner-3.1.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-scanner-3.1.2/package/yast2-scanner.changes
new/yast2-scanner-3.1.2/package/yast2-scanner.changes
--- old/yast2-scanner-3.1.2/package/yast2-scanner.changes 2014-12-04
13:34:15.000000000 +0100
+++ new/yast2-scanner-3.1.2/package/yast2-scanner.changes 2015-01-22
09:38:12.000000000 +0100
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Thu Dec 5 17:27:36 CEST 2014 - jsm...@suse.de
+
+- setup_network_scanner_config.with_systemd_support is an
+ enhancement for /usr/lib/YaST2/bin/setup_network_scanner_config
+ that provides additional support for systemd (bnc#859353).
+
+-------------------------------------------------------------------
+Thu Dec 5 16:45:07 CEST 2014 - jsm...@suse.de
+
+- use_fast_append_instead_of_slow_add.diff replaces
+ slow Builtins.add() with fast '<<' append operator
+ where needed to avoid "hang up impression" (bnc#877516).
+
+-------------------------------------------------------------------
Thu Dec 4 09:51:31 UTC 2014 - jreidin...@suse.com
- remove X-KDE-Library from desktop file (bnc#899104)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-scanner-3.1.2/src/modules/Scanner.rb
new/yast2-scanner-3.1.2/src/modules/Scanner.rb
--- old/yast2-scanner-3.1.2/src/modules/Scanner.rb 2014-12-04
13:34:15.000000000 +0100
+++ new/yast2-scanner-3.1.2/src/modules/Scanner.rb 2015-01-22
09:38:12.000000000 +0100
@@ -1794,20 +1794,14 @@
end
# Take the filter_string into account:
if "" == filter_string
- model_items = Builtins.add(
- model_items,
- Item(Id(database_index), model_string)
- )
+ model_items << Item(Id(database_index), model_string)
else
# test whether the model_string matches to the filter_string:
if Builtins.regexpmatch(
Builtins.tolower(model_string),
Builtins.tolower(filter_string)
)
- model_items = Builtins.add(
- model_items,
- Item(Id(database_index), model_string)
- )
+ model_items << Item(Id(database_index), model_string)
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-scanner-3.1.2/tools/setup_network_scanner_config
new/yast2-scanner-3.1.2/tools/setup_network_scanner_config
--- old/yast2-scanner-3.1.2/tools/setup_network_scanner_config 2014-12-04
13:34:15.000000000 +0100
+++ new/yast2-scanner-3.1.2/tools/setup_network_scanner_config 2015-01-22
09:38:12.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/bash
-# Johannes Meixner <jsm...@suse.de>, 2004, 2005, 2006, 2007, 2008, 2010
+# Johannes Meixner <jsm...@suse.de>, 2004, 2005, 2006, 2007, 2008, 2010, 2014
#
# Copyright (c) 2010 Novell, Inc.
# All Rights Reserved.
@@ -39,6 +39,8 @@
DEACTIVATE_BACKEND=${0%/*}/deactivate_scanner_backend
XINETD_CONFIG_FILE="/etc/xinetd.d/sane-port"
XINETD_INIT_SCRIPT="/etc/init.d/xinetd"
+XINETD_SYSTEMD_UNIT="xinetd.service"
+XINETD_SYSTEMD_UNIT_FILE="/usr/lib/systemd/system/$XINETD_SYSTEMD_UNIT"
# Function to remove old entries and append new entries to a SANE config file:
ReWrite()
@@ -69,15 +71,39 @@
# and do the appropriate stuff regarding the xinetd:
if [ -n "$SANED_CONFIG" ]
then sed -i -e 's/^.*disable.*$/\tdisable = no/' $XINETD_CONFIG_FILE || {
echo "Failed to enable saned in $XINETD_CONFIG_FILE" 1>&2 ; exit 6 ; }
- if $XINETD_INIT_SCRIPT status &>/dev/null
- then $XINETD_INIT_SCRIPT reload || { echo "Failed to reload xinetd" 1>&2
; exit 7 ; }
- else $XINETD_INIT_SCRIPT start || { echo "Failed to start xinetd" 1>&2 ;
exit 8 ; }
- insserv xinetd || { echo "Failed to insserv xinetd" 1>&2 ; exit 9 ; }
+ if test -e $XINETD_INIT_SCRIPT
+ then if $XINETD_INIT_SCRIPT status &>/dev/null
+ then $XINETD_INIT_SCRIPT reload || { echo "Failed to reload xinetd"
1>&2 ; exit 7 ; }
+ else $XINETD_INIT_SCRIPT start || { echo "Failed to start xinetd"
1>&2 ; exit 8 ; }
+ insserv xinetd || { echo "Failed to insserv xinetd" 1>&2 ; exit
9 ; }
+ fi
+ exit 0
fi
+ if test -e $XINETD_SYSTEMD_UNIT_FILE
+ then if systemctl --quiet is-active $XINETD_SYSTEMD_UNIT && systemctl
--quiet is-enabled $XINETD_SYSTEMD_UNIT
+ then systemctl --quiet reload $XINETD_SYSTEMD_UNIT || { echo "Failed
to reload xinetd" 1>&2 ; exit 7 ; }
+ else systemctl --quiet start $XINETD_SYSTEMD_UNIT || { echo "Failed
to start xinetd" 1>&2 ; exit 8 ; }
+ systemctl --quiet enable $XINETD_SYSTEMD_UNIT || { echo "Failed
to enable xinetd" 1>&2 ; exit 9 ; }
+ fi
+ exit 0
+ fi
+ echo "Cannot reload or start and enable xinetd (neither
$XINETD_INIT_SCRIPT nor $XINETD_SYSTEMD_UNIT_FILE)" 1>&2
+ exit 11
else sed -i -e 's/^.*disable.*$/\tdisable = yes/' $XINETD_CONFIG_FILE || {
echo "Failed to disable saned in $XINETD_CONFIG_FILE" 1>&2 ; exit 10 ; }
- if $XINETD_INIT_SCRIPT status &>/dev/null
- then $XINETD_INIT_SCRIPT reload || { echo "Failed to reload xinetd" 1>&2
; exit 7 ; }
+ if test -e $XINETD_INIT_SCRIPT
+ then if $XINETD_INIT_SCRIPT status &>/dev/null
+ then $XINETD_INIT_SCRIPT reload || { echo "Failed to reload xinetd"
1>&2 ; exit 7 ; }
+ fi
+ exit 0
+ fi
+ if test -e $XINETD_SYSTEMD_UNIT_FILE
+ then if systemctl --quiet is-active $XINETD_SYSTEMD_UNIT
+ then systemctl --quiet reload $XINETD_SYSTEMD_UNIT || { echo "Failed
to reload xinetd" 1>&2 ; exit 7 ; }
+ fi
+ exit 0
fi
+ echo "Cannot reload xinetd (neither $XINETD_INIT_SCRIPT nor
$XINETD_SYSTEMD_UNIT_FILE)" 1>&2
+ exit 11
fi
exit 0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
