Hello community,
here is the log from the commit of package yast2-network
checked in at Fri Apr 7 17:05:56 CEST 2006.
--------
--- yast2-network/yast2-network.changes 2006-04-06 19:48:56.000000000 +0200
+++ yast2-network/yast2-network.changes 2006-04-07 14:29:17.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Apr 7 11:13:25 CEST 2006 - locilka@suse.cz
+
+- Adding more error messages into log when some bash command fails
+ during the internet test (#162628).
+- Check the installed version of release-notes against the
+ downloaded one during the internet test. Skip installation of
+ release-notes in case of the same version (#164388).
+- 2.13.43
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.13.42.tar.bz2
New:
----
yast2-network-2.13.43.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.zqMDSX/_old 2006-04-07 17:05:33.000000000 +0200
+++ /var/tmp/diff_new_pack.zqMDSX/_new 2006-04-07 17:05:33.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.13.42)
+# spec file for package yast2-network (Version 2.13.43)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-network
-Version: 2.13.42
+Version: 2.13.43
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.13.42.tar.bz2
+Source0: yast2-network-2.13.43.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -49,7 +49,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.13.42
+%setup -n yast2-network-2.13.43
%build
%{prefix}/bin/y2tool y2autoconf
@@ -103,6 +103,13 @@
/usr/share/YaST2/schema/autoyast/rnc/networking.rnc
%changelog -n yast2-network
+* Fri Apr 07 2006 - locilka@suse.cz
+- Adding more error messages into log when some bash command fails
+ during the internet test (#162628).
+- Check the installed version of release-notes against the
+ downloaded one during the internet test. Skip installation of
+ release-notes in case of the same version (#164388).
+- 2.13.43
* Thu Apr 06 2006 - mvidner@suse.cz
- Disable suse_register if the internet test fails (#164042).
- Disable the back button in inst_hostname (jsuchome, #157125).
++++++ yast2-network-2.13.42.tar.bz2 -> yast2-network-2.13.43.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.42/VERSION new/yast2-network-2.13.43/VERSION
--- old/yast2-network-2.13.42/VERSION 2006-04-06 19:48:37.000000000 +0200
+++ new/yast2-network-2.13.43/VERSION 2006-04-07 14:29:48.000000000 +0200
@@ -1 +1 @@
-2.13.42
+2.13.43
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.42/configure new/yast2-network-2.13.43/configure
--- old/yast2-network-2.13.42/configure 2006-04-06 20:02:59.000000000 +0200
+++ new/yast2-network-2.13.43/configure 2006-04-07 14:34:40.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-network 2.13.42.
+# Generated by GNU Autoconf 2.59 for yast2-network 2.13.43.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.13.42'
-PACKAGE_STRING='yast2-network 2.13.42'
+PACKAGE_VERSION='2.13.43'
+PACKAGE_STRING='yast2-network 2.13.43'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-network 2.13.42 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.13.43 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.13.42:";;
+ short | recursive ) echo "Configuration of yast2-network 2.13.43:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.13.42
+yast2-network configure 2.13.43
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-network $as_me 2.13.42, which was
+It was created by yast2-network $as_me 2.13.43, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.13.42'
+ VERSION='2.13.43'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.42"
+VERSION="2.13.43"
RPMNAME="yast2-network"
MAINTAINER="Martin Vidner "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-network $as_me 2.13.42, which was
+This file was extended by yast2-network $as_me 2.13.43, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.13.42
+yast2-network config.status 2.13.43
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.42/configure.in new/yast2-network-2.13.43/configure.in
--- old/yast2-network-2.13.42/configure.in 2006-04-06 20:02:51.000000000 +0200
+++ new/yast2-network-2.13.43/configure.in 2006-04-07 14:34:35.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.13.42, http://www.suse.de/feedback, yast2-network)
+AC_INIT(yast2-network, 2.13.43, http://www.suse.de/feedback, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.42"
+VERSION="2.13.43"
RPMNAME="yast2-network"
MAINTAINER="Martin Vidner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.42/network.pot new/yast2-network-2.13.43/network.pot
--- old/yast2-network-2.13.42/network.pot 2006-02-20 09:47:26.000000000 +0100
+++ new/yast2-network-2.13.43/network.pot 2006-04-07 10:42:02.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-20 09:47+0100\n"
+"POT-Creation-Date: 2006-04-07 10:42+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -436,9 +436,7 @@
"Then press the appropriate button: <B>Edit</B> or <B>Delete</B>.</P>"
msgstr ""
-#. Table header 4/4
#: src/dsl/complex.ycp:305 src/isdn/complex.ycp:365 src/modem/complex.ycp:325
-#: src/services/routing.ycp:107
msgid "Device"
msgstr ""
@@ -605,6 +603,14 @@
msgid "Initializing..."
msgstr ""
+#: src/installation/a.ycp:7
+msgid "aaa"
+msgstr ""
+
+#: src/installation/a.ycp:8 src/installation/a.ycp:9 src/installation/a.ycp:10
+msgid "Release Notes"
+msgstr ""
+
#. Heading text
#: src/installation/dialogs.ycp:38
msgid "Enter Provider Password"
@@ -731,156 +737,163 @@
msgstr ""
#. Heading
-#: src/installation/dialogs.ycp:276
+#: src/installation/dialogs.ycp:286
msgid "Internet Connection Test Logs:"
msgstr ""
-#: src/installation/dialogs.ycp:282
+#: src/installation/dialogs.ycp:292
msgid "&Select Log:"
msgstr ""
-#. Progress step 1/4
-#: src/installation/inst_do_net_test.ycp:70
+#. Progress step 1/3
+#: src/installation/inst_do_net_test.ycp:77
msgid "Connecting to Internet..."
msgstr ""
-#. Progress step 2/4
-#: src/installation/inst_do_net_test.ycp:72
+#. Progress step 2/3
+#: src/installation/inst_do_net_test.ycp:79
msgid "Downloading the latest release notes..."
msgstr ""
-#. Progress step 3/4
-#: src/installation/inst_do_net_test.ycp:74
-msgid "Checking for latest updates..."
-msgstr ""
-
-#. Progress step 4/4
-#: src/installation/inst_do_net_test.ycp:76
+#. Progress step 3/3
+#: src/installation/inst_do_net_test.ycp:81
msgid "Closing connection..."
msgstr ""
#. Test dialog caption
-#: src/installation/inst_do_net_test.ycp:102
+#: src/installation/inst_do_net_test.ycp:107
msgid "Running Internet Connection Test"
msgstr ""
#. help for dialog "Running Internet Connection Test"
-#: src/installation/inst_do_net_test.ycp:105
+#: src/installation/inst_do_net_test.ycp:110
msgid ""
"<p>Here, view the progress of the\n"
"Internet connection test.</p>\n"
msgstr ""
#. help for dialog "Running Internet Connection Test"
-#: src/installation/inst_do_net_test.ycp:110
+#: src/installation/inst_do_net_test.ycp:115
msgid ""
"<p>The test can be aborted by pressing\n"
"<b>Abort Test</b>.</p>\n"
msgstr ""
#. help for dialog "Running Internet Connection Test"
-#: src/installation/inst_do_net_test.ycp:120
+#: src/installation/inst_do_net_test.ycp:125
msgid ""
"<p>If the test fails, return to the network configuration\n"
"and correct the settings.</p>\n"
msgstr ""
#. Label for result of internet test
-#: src/installation/inst_do_net_test.ycp:141
+#: src/installation/inst_do_net_test.ycp:144
msgid "Result:"
msgstr ""
#. Push Button to abort internet test
-#: src/installation/inst_do_net_test.ycp:149
+#: src/installation/inst_do_net_test.ycp:152
msgid "&Abort Test"
msgstr ""
#. Frame label: status of internet test
-#: src/installation/inst_do_net_test.ycp:152
+#: src/installation/inst_do_net_test.ycp:155
msgid "Test Status"
msgstr ""
#. Push Button to see logs of internet test
-#: src/installation/inst_do_net_test.ycp:170
+#: src/installation/inst_do_net_test.ycp:173
msgid "&View Logs..."
msgstr ""
#. result of internet test
#. Progress result
-#: src/installation/inst_do_net_test.ycp:201 src/lan/cmdline.ycp:73
+#: src/installation/inst_do_net_test.ycp:204 src/lan/cmdline.ycp:73
#: src/lan/cmdline.ycp:89
msgid "Success"
msgstr ""
#. result of internet test
-#: src/installation/inst_do_net_test.ycp:204
+#: src/installation/inst_do_net_test.ycp:207
msgid "Failure"
msgstr ""
#. label of combobox where the log is selected
-#: src/installation/inst_do_net_test.ycp:212
+#: src/installation/inst_do_net_test.ycp:215
msgid "Kernel Network Interfaces"
msgstr ""
#. label of combobox where the log is selected
-#: src/installation/inst_do_net_test.ycp:219
+#: src/installation/inst_do_net_test.ycp:222
msgid "Kernel Routing Table"
msgstr ""
#. label of combobox where the log is selected
-#: src/installation/inst_do_net_test.ycp:225
+#: src/installation/inst_do_net_test.ycp:228
msgid "Hostname Lookup"
msgstr ""
#. label of combobox where the log is selected
-#: src/installation/inst_do_net_test.ycp:235
+#: src/installation/inst_do_net_test.ycp:238
msgid "Kernel Messages"
msgstr ""
#. label of combobox where the log is selected
-#: src/installation/inst_do_net_test.ycp:242
+#: src/installation/inst_do_net_test.ycp:245
msgid "PPP Daemon"
msgstr ""
#. label of combobox where the log is selected
-#: src/installation/inst_do_net_test.ycp:302
+#: src/installation/inst_do_net_test.ycp:333
msgid "Download of Release Notes"
msgstr ""
+#. popup error message
+#: src/installation/inst_do_net_test.ycp:351
+msgid ""
+"Cannot install downloaded release notes.\n"
+"RPM signature check failed."
+msgstr ""
+
+#. popup error message
+#: src/installation/inst_do_net_test.ycp:365
+msgid "Installation of downloaded release notes failed."
+msgstr ""
+
#. label of combobox where the log is selected
-#: src/installation/inst_do_net_test.ycp:364
+#: src/installation/inst_do_net_test.ycp:404
msgid "Opening of Connection"
msgstr ""
#. popup to inform user about the failure
-#: src/installation/inst_do_net_test.ycp:369
-#: src/installation/inst_do_net_test.ycp:394
+#: src/installation/inst_do_net_test.ycp:409
+#: src/installation/inst_do_net_test.ycp:434
msgid ""
"Connecting to the Internet failed. View\n"
"the logs for details.\n"
msgstr ""
#. popup to inform user about the failure
-#: src/installation/inst_do_net_test.ycp:440
+#: src/installation/inst_do_net_test.ycp:478
msgid ""
"Download of latest release notes failed. View\n"
"the logs for details.\n"
msgstr ""
#. label of combobox where the log is selected
-#: src/installation/inst_do_net_test.ycp:480
+#: src/installation/inst_do_net_test.ycp:519
msgid "Check for Patches"
msgstr ""
#. popup to inform user about the failure
-#: src/installation/inst_do_net_test.ycp:491
+#: src/installation/inst_do_net_test.ycp:530
msgid ""
"Check for latest updates failed. View\n"
"the logs for details.\n"
msgstr ""
#. label of combobox where the log is selected
-#: src/installation/inst_do_net_test.ycp:517
+#: src/installation/inst_do_net_test.ycp:556
msgid "Closing of Connection"
msgstr ""
@@ -1666,33 +1679,33 @@
msgstr ""
#. Popup text
-#: src/lan/address.ycp:302
+#: src/lan/address.ycp:299
msgid ""
"Duplicate IP address detected.\n"
"Really continue?\n"
msgstr ""
#. Address dialog help 5/8
-#: src/lan/address.ycp:342
+#: src/lan/address.ycp:331
msgid "<p>Clicking <b>Next</b> completes the configuration.</p>"
msgstr ""
#. Address dialog help 8/8
-#: src/lan/address.ycp:344
+#: src/lan/address.ycp:333
msgid ""
"<p>Contact your <b>network administrator</b> for more information about\n"
"the network configuration.</p>"
msgstr ""
-#: src/lan/address.ycp:354
+#: src/lan/address.ycp:343
msgid "&Name of Interface"
msgstr ""
-#: src/lan/address.ycp:356
+#: src/lan/address.ycp:345
msgid "<p>TODO kind of vague!</p>"
msgstr ""
-#: src/lan/address.ycp:360
+#: src/lan/address.ycp:349
msgid "&Binding Characteristic"
msgstr ""
@@ -1700,41 +1713,41 @@
#. widget name; "tooltip" or "toolhelp" is visually bound to the
#. widget, does not need to contain its name (the translator comment
#. needs to, though)
-#: src/lan/address.ycp:366
+#: src/lan/address.ycp:355
msgid "<p>FIXME better help! Which hardware to bind to</p>"
msgstr ""
#. synchronize keys with ... whatever
#. combo box item. %1 is like "00:de:ad:po:rk:00"
-#: src/lan/address.ycp:371
+#: src/lan/address.ycp:360
#, ycp-format
msgid "MAC Address: %1"
msgstr ""
#. combo box item. %1 is like "pci-0000:01:09.0"
-#: src/lan/address.ycp:373
+#: src/lan/address.ycp:362
#, ycp-format
msgid "Bus Path: %1"
msgstr ""
#. combo box item. %1 is like "1022-2000"
-#: src/lan/address.ycp:375
+#: src/lan/address.ycp:364
#, ycp-format
msgid "Product ID: %1"
msgstr ""
#. combo box item. %1 is like "1022-2000-1259-2700"
-#: src/lan/address.ycp:377
+#: src/lan/address.ycp:366
#, ycp-format
msgid "Product Sub-ID: %1"
msgstr ""
#. Combo Box label
-#: src/lan/address.ycp:384
+#: src/lan/address.ycp:373
msgid "Firewall &Zone"
msgstr ""
-#: src/lan/address.ycp:387
+#: src/lan/address.ycp:376
msgid ""
"<p>Select the <b>Firewall Zone</b> to put the interface in. If you\n"
"select a zone, the firewall will be enabled. If you do not and other \n"
@@ -1745,109 +1758,109 @@
msgstr ""
#. check box label
-#: src/lan/address.ycp:398
+#: src/lan/address.ycp:386
msgid "&Mandatory Interface"
msgstr ""
-#: src/lan/address.ycp:400
+#: src/lan/address.ycp:388
msgid "<p><b>Mandatory Interface</b> specifies whether the network service reports failure if the interface fails to start at boot time.</p>"
msgstr ""
#. textentry label, Maximum Transfer Unit
-#: src/lan/address.ycp:405
+#: src/lan/address.ycp:393
msgid "&MTU"
msgstr ""
-#: src/lan/address.ycp:407
+#: src/lan/address.ycp:395
msgid "<p>You can set the maximum transfer unit (<b>MTU</b>) of an interface.</p>"
msgstr ""
#. ComboBox label
-#: src/lan/address.ycp:412 src/lan/hardware.ycp:163
+#: src/lan/address.ycp:400 src/lan/hardware.ycp:163
msgid "&Device Type"
msgstr ""
#. ComboBox label
#. TextEntry label
-#: src/lan/address.ycp:424 src/lan/hardware.ycp:152
+#: src/lan/address.ycp:412 src/lan/hardware.ycp:152
msgid "&Configuration Name"
msgstr ""
#. radio button label
-#: src/lan/address.ycp:442 src/routines/widgets.ycp:73
+#: src/lan/address.ycp:430 src/routines/widgets.ycp:73
msgid "A&utomatic Address Setup (via DHCP)"
msgstr ""
#. Address dialog help 2-6/8: dynamic address preferred
#. Address dialog help 2/8
-#: src/lan/address.ycp:449
+#: src/lan/address.ycp:437
msgid ""
"<p>You can select dynamic address assignment\n"
"if you have a <b>DHCP server</b> running on your local network.</p>\n"
msgstr ""
#. Address dialog help 3/8
-#: src/lan/address.ycp:453
+#: src/lan/address.ycp:441
msgid ""
"<p>Also select this if you do not have a static IP address assigned\n"
"by the system administrator or your cable or DSL provider.</p>"
msgstr ""
#. Address dialog help 4/8
-#: src/lan/address.ycp:456
+#: src/lan/address.ycp:444
msgid ""
"<p>Network addresses are then obtained\n"
"<b>automatically</b> from the server.</p>\n"
msgstr ""
#. Address dialog help 6/8
-#: src/lan/address.ycp:460
+#: src/lan/address.ycp:448
msgid "<p>Otherwise, network addresses must be assigned <b>manually</b>.</p>"
msgstr ""
#. radio button label
-#: src/lan/address.ycp:465 src/routines/widgets.ycp:75
+#: src/lan/address.ycp:453 src/routines/widgets.ycp:75
msgid "S&tatic Address Setup"
msgstr ""
#. Radio button label
-#: src/lan/address.ycp:475
+#: src/lan/address.ycp:463
msgid "A&utomatic Address Setup (via DHCP+AUTOIP)"
msgstr ""
#. Radio button label
-#: src/lan/address.ycp:485
+#: src/lan/address.ycp:473
msgid "A&utomatic Address Setup (via AUTOIP)"
msgstr ""
#. Radio button label
-#: src/lan/address.ycp:494
+#: src/lan/address.ycp:482
msgid "&Without an address"
msgstr ""
-#: src/lan/address.ycp:496
+#: src/lan/address.ycp:484
msgid "without an IPv4 address, this is useful when the interface is used for pppoe"
msgstr ""
#. Text entry label for IP address
#. TextEntry label
-#: src/lan/address.ycp:504 src/lan/virtual.ycp:269 src/services/host.ycp:280
+#: src/lan/address.ycp:492 src/lan/virtual.ycp:269 src/services/host.ycp:280
msgid "&IP Address"
msgstr ""
#. validation error popup
#. Popup::Error text
-#: src/lan/address.ycp:510 src/lan/virtual.ycp:301 src/lan/virtual.ycp:316
+#: src/lan/address.ycp:498 src/lan/virtual.ycp:301 src/lan/virtual.ycp:316
#: src/services/host.ycp:314
msgid "The IP address is invalid."
msgstr ""
#. Text entry label
-#: src/lan/address.ycp:516
+#: src/lan/address.ycp:504
msgid "R&emote IP Address"
msgstr ""
-#: src/lan/address.ycp:517
+#: src/lan/address.ycp:505
msgid ""
"<p>Enter the <b>IP Address</b> (e.g., 192.168.100.99)\n"
"for your computer and the <b>Remote IP Address</b> (e.g., 192.168.100.254)\n"
@@ -1855,16 +1868,16 @@
msgstr ""
#. validation error popup
-#: src/lan/address.ycp:523
+#: src/lan/address.ycp:511
msgid "The remote IP address is invalid."
msgstr ""
#. Text entry label for network mask
-#: src/lan/address.ycp:529
+#: src/lan/address.ycp:517
msgid "&Subnet Mask"
msgstr ""
-#: src/lan/address.ycp:531
+#: src/lan/address.ycp:519
msgid ""
"<p>Enter the IP address (e.g., 192.168.100.99) for your computer,\n"
"the network mask (usually 255.255.255.0), and, optionally, the default gateway\n"
@@ -1873,108 +1886,108 @@
#. validation error popup
#. Popup::Error text
-#: src/lan/address.ycp:538 src/lan/virtual.ycp:325
+#: src/lan/address.ycp:526 src/lan/virtual.ycp:325
msgid "The subnet mask is invalid."
msgstr ""
#. ComboBox label
-#: src/lan/address.ycp:543 src/services/routing.ycp:93
+#: src/lan/address.ycp:531 src/services/routing.ycp:94
msgid "Default &Gateway"
msgstr ""
-#: src/lan/address.ycp:545
+#: src/lan/address.ycp:533
msgid "<p><b>Default Gateway</b> TODO: the original help is bad</p>"
msgstr ""
#. menu button label
-#: src/lan/address.ycp:552
+#: src/lan/address.ycp:540
msgid "&Advanced..."
msgstr ""
#. push button label
-#: src/lan/address.ycp:564
+#: src/lan/address.ycp:552
msgid "DH&CP Options"
msgstr ""
#. push button label
-#: src/lan/address.ycp:574
+#: src/lan/address.ycp:562
msgid "Addi&tional Addresses"
msgstr ""
#. push button label
-#: src/lan/address.ycp:584
+#: src/lan/address.ycp:572
msgid "H&ardware Details"
msgstr ""
#. push button label
-#: src/lan/address.ycp:595
+#: src/lan/address.ycp:583
msgid "&S/390"
msgstr ""
#. push button label
-#: src/lan/address.ycp:605
+#: src/lan/address.ycp:593
msgid "&Hostname and Name Server"
msgstr ""
#. push button label
-#: src/lan/address.ycp:615
+#: src/lan/address.ycp:603
msgid "R&outing"
msgstr ""
#. Frame label
#. common settings for interfaces
-#: src/lan/address.ycp:687
+#: src/lan/address.ycp:688
msgid "Common Network Interface Settings"
msgstr ""
#. Frame label
#. detailed settings for interfaces
-#: src/lan/address.ycp:706
+#: src/lan/address.ycp:707
msgid "Detailed Network Interface Settings"
msgstr ""
#. Address dialog help 2-6/8: static address preferred
-#: src/lan/address.ycp:749
+#: src/lan/address.ycp:750
msgid ""
"<p>DHCP configuration is not recommended for this product.\n"
"Components of this product might not work with DHCP.</p>"
msgstr ""
-#: src/lan/address.ycp:799
+#: src/lan/address.ycp:802
msgid "Detailed Settings"
msgstr ""
-#: src/lan/address.ycp:870
+#: src/lan/address.ycp:873
msgid "&General"
msgstr ""
#. FIXME we have helps per widget and for the whole
#. tab set but not for one tab
-#: src/lan/address.ycp:874
+#: src/lan/address.ycp:877
msgid "<p>Configure the detailed network card settings here.</p>"
msgstr ""
#. FIXME: here it does not complain about missing
#. shortcuts
-#: src/lan/address.ycp:879
+#: src/lan/address.ycp:882
msgid "&Address"
msgstr ""
#. Address tab help
-#: src/lan/address.ycp:882
+#: src/lan/address.ycp:885
msgid "<p>Configure your IP address.</p>"
msgstr ""
-#: src/lan/address.ycp:885
+#: src/lan/address.ycp:888
msgid "&Wireless"
msgstr ""
-#: src/lan/address.ycp:890
+#: src/lan/address.ycp:893
msgid "&DNS"
msgstr ""
#. Address dialog caption
-#: src/lan/address.ycp:913
+#: src/lan/address.ycp:916
msgid "Network Address Setup"
msgstr ""
@@ -2710,13 +2723,13 @@
#. Table header label
#. Table header 3/4
-#: src/lan/virtual.ycp:112 src/services/routing.ycp:105
+#: src/lan/virtual.ycp:112 src/services/routing.ycp:106
msgid "Netmask"
msgstr ""
#. PushButton label
#: src/lan/virtual.ycp:115 src/services/host.ycp:110
-#: src/services/routing.ycp:109
+#: src/services/routing.ycp:114
msgid "Ad&d"
msgstr ""
@@ -2724,7 +2737,7 @@
#. Pushbutton label
#. PushButton label
#: src/lan/virtual.ycp:117 src/routines/summary.ycp:148
-#: src/services/host.ycp:112 src/services/routing.ycp:111
+#: src/services/host.ycp:112 src/services/routing.ycp:116
msgid "&Edit"
msgstr ""
@@ -2732,7 +2745,7 @@
#. Pushbutton label
#. PushButton label
#: src/lan/virtual.ycp:119 src/routines/summary.ycp:150
-#: src/services/host.ycp:114 src/services/routing.ycp:113
+#: src/services/host.ycp:114 src/services/routing.ycp:118
msgid "De&lete"
msgstr ""
@@ -3520,34 +3533,34 @@
msgstr ""
#. Summary text
-#: src/modules/DNS.ycp:302
+#: src/modules/DNS.ycp:339
msgid "Hostname: Set by DHCP"
msgstr ""
#. Summary text
-#: src/modules/DNS.ycp:305
+#: src/modules/DNS.ycp:342
#, ycp-format
msgid "Hostname: %1"
msgstr ""
#. Summary text
-#: src/modules/DNS.ycp:309
+#: src/modules/DNS.ycp:346
msgid "Name Servers: Set by DHCP"
msgstr ""
#. Summary text
-#: src/modules/DNS.ycp:311
+#: src/modules/DNS.ycp:348
msgid "Search List: Set by DHCP"
msgstr ""
#. Summary text
-#: src/modules/DNS.ycp:321
+#: src/modules/DNS.ycp:358
#, ycp-format
msgid "Name Servers: %1"
msgstr ""
#. Summary text
-#: src/modules/DNS.ycp:324
+#: src/modules/DNS.ycp:361
#, ycp-format
msgid "Search List: %1"
msgstr ""
@@ -4091,7 +4104,7 @@
#. network mode: the interfaces are controlled by the user
#: src/modules/Lan.ycp:642
-msgid "User Controlled Interfaces via NetworkManager Applet"
+msgid "User-Controlled Interfaces with the NetworkManager Applet"
msgstr ""
#. disable NetworkManager applet
@@ -4101,7 +4114,7 @@
#. network mode
#: src/modules/Lan.ycp:650
-msgid "Traditional Method without NetworkManager Applet"
+msgid "Traditional Method without the NetworkManager Applet"
msgstr ""
#. enable NetworkManager applet
@@ -4225,7 +4238,7 @@
#. message popup
#. %1 is a system command
#. Note: it is a DISPLAY manager, not a WINDOW manager
-#: src/modules/Remote.ycp:197
+#: src/modules/Remote.ycp:198
#, ycp-format
msgid ""
"For the settings to take effect, the display manager\n"
@@ -4236,28 +4249,28 @@
msgstr ""
#. Label in proposal text
-#: src/modules/Remote.ycp:217
+#: src/modules/Remote.ycp:218
msgid "Remote administration is enabled."
msgstr ""
#. Label in proposal text
-#: src/modules/Remote.ycp:221
+#: src/modules/Remote.ycp:222
msgid "Remote administration is disabled."
msgstr ""
#. Summary text
-#: src/modules/Routing.ycp:234
+#: src/modules/Routing.ycp:245
#, ycp-format
msgid "Gateway: %1"
msgstr ""
#. Summary text
-#: src/modules/Routing.ycp:240
+#: src/modules/Routing.ycp:251
msgid "IP Forwarding: on"
msgstr ""
#. Summary text
-#: src/modules/Routing.ycp:244
+#: src/modules/Routing.ycp:255
msgid "IP Forwarding: off"
msgstr ""
@@ -5654,66 +5667,66 @@
msgstr ""
#. Popup::Error text
-#: src/services/dns.ycp:222
+#: src/services/dns.ycp:223
#, ycp-format
msgid "The search list can have at most %1 domains."
msgstr ""
#. Popup::Error text
-#: src/services/dns.ycp:227
+#: src/services/dns.ycp:228
#, ycp-format
msgid "The search list can have at most %1 characters."
msgstr ""
#. Popup::Error text
-#: src/services/dns.ycp:232
+#: src/services/dns.ycp:233
#, ycp-format
msgid "The search domain '%1' is invalid."
msgstr ""
#. help
-#: src/services/dns.ycp:257
+#: src/services/dns.ycp:258
msgid "<p>Enter the name for this computer and the DNS domain that it belongs to.</p>"
msgstr ""
#. validation error popup
#. Popup::Error text
-#: src/services/dns.ycp:262 src/services/host.ycp:330
+#: src/services/dns.ycp:263 src/services/host.ycp:330
msgid "The hostname is invalid."
msgstr ""
-#: src/services/dns.ycp:266
+#: src/services/dns.ycp:267
msgid "<p>Optionally enter the name server list and domain search list.</p>"
msgstr ""
#. #91202
-#: src/services/dns.ycp:273
+#: src/services/dns.ycp:274
msgid ""
"<p>Note that the hostname is global--it applies to all\n"
"interfaces, not just this one.</p>"
msgstr ""
#. textentry label
-#: src/services/dns.ycp:281
+#: src/services/dns.ycp:282
msgid "&Domain Name"
msgstr ""
-#: src/services/dns.ycp:283
+#: src/services/dns.ycp:284
msgid "<p>The domain is especially important if this computer is a mail server.</p>"
msgstr ""
#. validation error popup
-#: src/services/dns.ycp:293
+#: src/services/dns.ycp:294
msgid "The domain name is invalid."
msgstr ""
#. checkbox label
-#: src/services/dns.ycp:298
+#: src/services/dns.ycp:299
msgid "&Change Hostname via DHCP"
msgstr ""
#. help
-#: src/services/dns.ycp:301
+#: src/services/dns.ycp:302
msgid ""
"<p>If you are using DHCP to get an IP address, check whether to get\n"
"a hostname via DHCP.\n"
@@ -5723,29 +5736,29 @@
msgstr ""
#. textentry label
-#: src/services/dns.ycp:313
+#: src/services/dns.ycp:314
msgid "Name Server &1"
msgstr ""
#. validation error popup
-#: src/services/dns.ycp:321
+#: src/services/dns.ycp:322
msgid "The IP address of the name server is invalid."
msgstr ""
#. textentry label
-#: src/services/dns.ycp:328
+#: src/services/dns.ycp:329
msgid "Do&main Search"
msgstr ""
#. all help for resolver goes here for now
-#: src/services/dns.ycp:331
+#: src/services/dns.ycp:332
msgid ""
"<p>Enter the name servers and domain search list for resolving \n"
"hostnames. Usually they can be obtained by DHCP.</p>\n"
msgstr ""
#. resolver dialog help
-#: src/services/dns.ycp:335
+#: src/services/dns.ycp:336
msgid ""
"<p>A name server is a computer that translates hostnames into\n"
"IP addresses. This value must be entered as an <b>IP address</b>\n"
@@ -5753,7 +5766,7 @@
msgstr ""
#. resolver dialog help
-#: src/services/dns.ycp:340
+#: src/services/dns.ycp:341
msgid ""
"<p>Search domain is the domain name where hostname searching starts.\n"
"The primary search domain is usually the same as the domain name of\n"
@@ -5762,7 +5775,7 @@
msgstr ""
#. resolver dialog help
-#: src/services/dns.ycp:346
+#: src/services/dns.ycp:347
msgid ""
"<p>If you plan to use a dial-up Internet connection and have set up your\n"
"connection to use dynamic DNS assignment, these values will be temporarily\n"
@@ -5770,19 +5783,19 @@
msgstr ""
#. checkbox label
-#: src/services/dns.ycp:357
+#: src/services/dns.ycp:358
msgid "&Update Name Servers and Search List via DHCP"
msgstr ""
#. Frame label
#. dialog caption
#. Frame label
-#: src/services/dns.ycp:381 src/services/dns.ycp:397 src/services/dns.ycp:480
+#: src/services/dns.ycp:382 src/services/dns.ycp:398 src/services/dns.ycp:482
msgid "Hostname and Domain Name"
msgstr ""
#. Warning popup text 1/2
-#: src/services/dns.ycp:423
+#: src/services/dns.ycp:425
#, ycp-format
msgid ""
"<p>The resolver configuration file (/etc/resolv.conf)\n"
@@ -5790,7 +5803,7 @@
msgstr ""
#. Warning popup text 2/2
-#: src/services/dns.ycp:427
+#: src/services/dns.ycp:429
msgid ""
"<ol>\n"
"<li>Modify the current (changed) version of the file.</li>\n"
@@ -5800,43 +5813,43 @@
msgstr ""
#. has been modified by "unknown process"
-#: src/services/dns.ycp:435
+#: src/services/dns.ycp:437
msgid "unknown process"
msgstr ""
#. PushButton label
-#: src/services/dns.ycp:445
+#: src/services/dns.ycp:447
msgid "&Accept"
msgstr ""
#. PushButton label
-#: src/services/dns.ycp:448
+#: src/services/dns.ycp:450
msgid "&Modify"
msgstr ""
#. DNS dialog caption
-#: src/services/dns.ycp:471
+#: src/services/dns.ycp:473
msgid "Hostname and Name Server Configuration"
msgstr ""
#. Frame label, emphasizing that the names are global,
#. not specific to one address
-#: src/services/dns.ycp:483
+#: src/services/dns.ycp:485
msgid "Hostname and Domain Name (Global)"
msgstr ""
#. Frame label
-#: src/services/dns.ycp:500
+#: src/services/dns.ycp:502
msgid "Name Servers and Domain Search List"
msgstr ""
#. text entry label
-#: src/services/dns.ycp:525
+#: src/services/dns.ycp:527
msgid "Name Server &2"
msgstr ""
#. text entry label
-#: src/services/dns.ycp:527
+#: src/services/dns.ycp:529
msgid "Name Server &3"
msgstr ""
@@ -6118,66 +6131,66 @@
msgstr ""
#. Frame label
-#: src/services/routing.ycp:96
+#: src/services/routing.ycp:97
msgid "Routing Table"
msgstr ""
#. CheckBox label
-#: src/services/routing.ycp:98
+#: src/services/routing.ycp:99
msgid "E&xpert Configuration"
msgstr ""
#. Table header 1/4
-#: src/services/routing.ycp:101
+#: src/services/routing.ycp:102
msgid "Destination"
msgstr ""
#. Table header 2/4
-#: src/services/routing.ycp:103
+#: src/services/routing.ycp:104
msgid "Gateway"
msgstr ""
#. CheckBox label
-#: src/services/routing.ycp:116
+#: src/services/routing.ycp:121
msgid "Enable &IP Forwarding"
msgstr ""
#. Popup::Error text
-#: src/services/routing.ycp:218
+#: src/services/routing.ycp:223
msgid "The default gateway is invalid."
msgstr ""
#. TextEntry label
-#: src/services/routing.ycp:281
+#: src/services/routing.ycp:287
msgid "&Destination"
msgstr ""
#. TextEntry label
-#: src/services/routing.ycp:283
+#: src/services/routing.ycp:289
msgid "&Gateway"
msgstr ""
#. TextEntry label
-#: src/services/routing.ycp:285
+#: src/services/routing.ycp:291
msgid "&Netmask"
msgstr ""
#. ComboBox label
-#: src/services/routing.ycp:287
+#: src/services/routing.ycp:293
msgid "De&vice (optional)"
msgstr ""
#. Popup::Error text
-#: src/services/routing.ycp:319
+#: src/services/routing.ycp:328
msgid "Destination is invalid."
msgstr ""
#. Popup::Error text
-#: src/services/routing.ycp:327
+#: src/services/routing.ycp:336
msgid "Gateway IP address is invalid."
msgstr ""
#. Popup::Error text
-#: src/services/routing.ycp:335
+#: src/services/routing.ycp:344
msgid "Subnetmask is invalid."
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.42/src/installation/inst_do_net_test.ycp new/yast2-network-2.13.43/src/installation/inst_do_net_test.ycp
--- old/yast2-network-2.13.42/src/installation/inst_do_net_test.ycp 2006-04-05 19:03:51.000000000 +0200
+++ new/yast2-network-2.13.43/src/installation/inst_do_net_test.ycp 2006-04-07 14:31:33.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Michal Svec
* Arvin Schnell
*
- * $Id: inst_do_net_test.ycp 29766 2006-04-05 17:03:48Z mvidner $
+ * $Id: inst_do_net_test.ycp 29878 2006-04-07 12:31:23Z locilka $
*/
{
@@ -211,42 +211,54 @@
define void copy_logs1 ()
{
+ integer ret_command = nil;
+ string run_command = nil;
+
// label of combobox where the log is selected
logs = add (logs, $[ `menuname : _("Kernel Network Interfaces"),
`filename : "ifconfig.log" ]);
- SCR::Execute (.target.bash, "/sbin/ifconfig > " +
- logdir + "/ifconfig.log",
+ run_command = "/sbin/ifconfig > " + logdir + "/ifconfig.log";
+ ret_command = (integer) SCR::Execute (.target.bash, run_command,
$["LANG" : GetLanguageUTF8 ()]);
+ if (ret_command != 0) y2error("Command '%1' failed -> %2", run_command, ret_command);
// label of combobox where the log is selected
logs = add (logs, $[ `menuname : _("Kernel Routing Table"),
`filename : "route.log" ]);
- SCR::Execute (.target.bash, "/sbin/route -n > " + logdir + "/route.log",
+ run_command = "/sbin/route -n > " + logdir + "/route.log";
+ ret_command = (integer) SCR::Execute (.target.bash, run_command,
$["LANG" : GetLanguageUTF8 ()]);
+ if (ret_command != 0) y2error("Command '%1' failed -> %2", run_command, ret_command);
// label of combobox where the log is selected
logs = add (logs, $[ `menuname : _("Hostname Lookup"),
`filename : "resolv.conf" ]);
- SCR::Execute (.target.bash, "/bin/cp /etc/resolv.conf " +
- logdir + "/resolv.conf");
+ run_command = "/bin/cp /etc/resolv.conf " + logdir + "/resolv.conf";
+ ret_command = (integer) SCR::Execute (.target.bash, run_command);
+ if (ret_command != 0) y2error("Command '%1' failed -> %2", run_command, ret_command);
}
define void copy_logs2 ()
{
+ integer ret_command = nil;
+ string run_command = nil;
+
// label of combobox where the log is selected
logs = add (logs, $[ `menuname : _("Kernel Messages"),
`filename : "messages" ]);
- SCR::Execute (.target.bash, Directory::ybindir + "/cut-messages > " +
- logdir + "/messages");
+ run_command = Directory::ybindir + "/cut-messages > " + logdir + "/messages";
+ ret_command = (integer) SCR::Execute (.target.bash, run_command);
+ if (ret_command != 0) y2error("Command '%1' failed -> %2", run_command, ret_command);
if (Internet::logfile != "") {
// label of combobox where the log is selected
logs = add (logs, $[ `menuname : _("PPP Daemon"),
`filename : "smpppd.log",
`prio : 20 ]);
- SCR::Execute (.target.bash, "/bin/cp " + Internet::logfile + " " +
- logdir + "/smpppd.log");
+ run_command = "/bin/cp " + Internet::logfile + " " + logdir + "/smpppd.log";
+ ret_command = (integer) SCR::Execute (.target.bash, run_command);
+ if (ret_command != 0) y2error("Command '%1' failed -> %2", run_command, ret_command);
}
}
@@ -278,6 +290,9 @@
// File names of downloaded release notes
list <string> release_notes_filenames = [];
+
+ // RPM names of downloaded release notes
+ map release_notes_rpms = $[];
/**
* Download all release notes mentioned in Product::relnotesurl_all
@@ -308,6 +323,10 @@
relnotes_counter,
substring (url, pos)
);
+ // Package name
+ release_notes_rpms[filename] = substring (url, pos);
+ release_notes_rpms[filename] = regexpsub(release_notes_rpms[filename]:"\.rpm", "(.*)\.rpm", "\\1");
+
// Where to store the curl log
string log_filename = sformat("curl_%1.log", relnotes_counter);
@@ -338,6 +357,37 @@
return test_ret;
}
+ /**
+ * Function checks whether the downloaded and installed versions are different
+ */
+ boolean AreRPMVersionsDifferent(string rpm_name, string disk_file) {
+ string query_format = "%{NAME}-%{VERSION}-%{RELEASE}";
+
+ // Checking the installed version of RPM
+ map cmd_installed_rpm_version = (map) SCR::Execute(.target.bash_output,
+ sformat("/bin/rpm -q --queryformat \"%1\" %2", query_format, rpm_name)
+ );
+ if (cmd_installed_rpm_version["exit"]:-1 != 0) {
+ y2warning("Cannot check the installed RPM version: %1 -> %2", disk_file, cmd_installed_rpm_version);
+ return true;
+ }
+ string installed_rpm_version = cmd_installed_rpm_version["stdout"]:"undefined-i";
+ y2milestone("Installed version: '%1'", installed_rpm_version);
+
+ // Checking the downloaded version of RPM
+ map cmd_downloaded_rpm_version = (map) SCR::Execute(.target.bash_output,
+ sformat("/bin/rpm -qp --queryformat \"%1\" %2", query_format, disk_file)
+ );
+ if (cmd_downloaded_rpm_version["exit"]:-1 != 0) {
+ y2warning("Cannot check the downloaded RPM version: %1 -> %2", disk_file, cmd_downloaded_rpm_version);
+ return true;
+ }
+ string downloaded_rpm_version = cmd_downloaded_rpm_version["stdout"]:"undefined-d";
+ y2milestone("Downloaded version: '%1'", downloaded_rpm_version);
+
+ // The same versions -> false
+ return (installed_rpm_version != downloaded_rpm_version);
+ }
define boolean install_release_notes () {
boolean test_ret = true;
@@ -354,7 +404,16 @@
// next loop
return;
}
-
+
+ // Checking whether installed/new rpm versions are different (#164388)
+ string rpm_name = release_notes_rpms[filename]:"";
+ if (AreRPMVersionsDifferent(rpm_name, filename)) {
+ y2milestone("RPM versions are different");
+ } else {
+ y2milestone("RPM versions are not different, skipping...");
+ return;
+ }
+
boolean old2 = PackageCallbacks::EnableAsterixPackage (false);
boolean ret2 = Pkg::TargetInstall (filename);
PackageCallbacks::EnableAsterixPackage (old2);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...