Hello community,
here is the log from the commit of package yast2
checked in at Wed Mar 29 20:58:40 CEST 2006.
--------
--- yast2/yast2.changes 2006-03-22 13:01:56.000000000 +0100
+++ yast2/yast2.changes 2006-03-29 17:04:40.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Mar 29 17:04:09 CEST 2006 - mvidner@suse.cz
+
+- Added PackageLock, a module to handle the big Zypp lock (#160319).
+- 2.13.41
+
+-------------------------------------------------------------------
+Mon Mar 27 10:24:51 CEST 2006 - locilka@suse.cz
+
+- TERM=raw -> TERM=dumb in Service::RunInitScriptWithTimeOut()
+
+-------------------------------------------------------------------
Old:
----
yast2-2.13.40.tar.bz2
New:
----
yast2-2.13.41.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.vUqjTB/_old 2006-03-29 20:57:47.000000000 +0200
+++ /var/tmp/diff_new_pack.vUqjTB/_new 2006-03-29 20:57:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.13.40)
+# spec file for package yast2 (Version 2.13.41)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,22 +11,24 @@
# norootforbuild
Name: yast2
-Version: 2.13.40
+Version: 2.13.41
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.13.40.tar.bz2
+Source0: yast2-2.13.41.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
# Need the new file popups
Requires: yast2-core >= 2.7.1
+# Pkg::Connect
+Requires: yast2-pkg-bindings >= 2.13.43
Requires: yast2_ui yast2_theme
# For Cron Agent, Module
Requires: perl-Config-Crontab
# for ag_tty (/bin/stty)
Requires: coreutils
-Requires: yast2-pkg-bindings, yast2-xml, yast2-hardware-detection
+Requires: yast2-xml, yast2-hardware-detection
Requires: SuSEfirewall2
Provides: yast2-lib-sequencer
Obsoletes: yast2-lib-sequencer
@@ -91,7 +93,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.13.40
+%setup -n yast2-2.13.41
%build
%{prefix}/bin/y2tool y2autoconf
@@ -190,6 +192,11 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog -n yast2
+* Wed Mar 29 2006 - mvidner@suse.cz
+- Added PackageLock, a module to handle the big Zypp lock (#160319).
+- 2.13.41
+* Mon Mar 27 2006 - locilka@suse.cz
+- TERM=raw -> TERM=dumb in Service::RunInitScriptWithTimeOut()
* Wed Mar 22 2006 - locilka@suse.cz
- better testing of UTF-8 support using the testutf8 binary
(#158001)
++++++ yast2-2.13.40.tar.bz2 -> yast2-2.13.41.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/Makefile.am new/yast2-2.13.41/Makefile.am
--- old/yast2-2.13.40/Makefile.am 2006-03-22 13:03:49.000000000 +0100
+++ new/yast2-2.13.41/Makefile.am 2006-03-29 17:06:25.000000000 +0200
@@ -154,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,6 +199,9 @@
false; \
fi
+check-textdomain:
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/Makefile.in new/yast2-2.13.41/Makefile.in
--- old/yast2-2.13.40/Makefile.in 2006-03-22 13:04:04.000000000 +0100
+++ new/yast2-2.13.41/Makefile.in 2006-03-29 17:07:07.000000000 +0200
@@ -789,7 +789,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -832,6 +832,9 @@
false; \
fi
+check-textdomain:
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/VERSION new/yast2-2.13.41/VERSION
--- old/yast2-2.13.40/VERSION 2006-03-22 13:01:38.000000000 +0100
+++ new/yast2-2.13.41/VERSION 2006-03-29 17:03:01.000000000 +0200
@@ -1 +1 @@
-2.13.40
+2.13.41
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/base.pot new/yast2-2.13.41/base.pot
--- old/yast2-2.13.40/base.pot 2006-02-07 16:03:17.000000000 +0100
+++ new/yast2-2.13.41/base.pot 2005-12-14 16:33:36.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-07 16:03+0100\n"
+"POT-Creation-Date: 2005-12-14 16:33+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -258,53 +258,53 @@
msgstr ""
#. translators: progress message - command line interface ready
-#: library/commandline/src/CommandLine.ycp:1258
+#: library/commandline/src/CommandLine.ycp:1263
msgid "Ready"
msgstr ""
#. non-GUI handling
-#: library/commandline/src/CommandLine.ycp:1282
+#: library/commandline/src/CommandLine.ycp:1287
msgid "Initializing"
msgstr ""
#. translators: Progress message - the command line interface is about to finish
-#: library/commandline/src/CommandLine.ycp:1321
+#: library/commandline/src/CommandLine.ycp:1326
msgid "Finishing"
msgstr ""
#. translators: The command line interface is finished
-#: library/commandline/src/CommandLine.ycp:1328
+#: library/commandline/src/CommandLine.ycp:1333
msgid "Done"
msgstr ""
#. translators: The command line interface is finished without writing the changes
-#: library/commandline/src/CommandLine.ycp:1331
+#: library/commandline/src/CommandLine.ycp:1336
msgid "Quitting (without changes)"
msgstr ""
#. prompt message displayed in the commandline mode
#. when user is asked to replay "yes" or "no" (localized)
-#: library/commandline/src/CommandLine.ycp:1346
-msgid "yes or no?"
+#: library/commandline/src/CommandLine.ycp:1351
+msgid "yes/no?: "
msgstr ""
#. yes - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/CommandLine.ycp:1351
+#: library/commandline/src/CommandLine.ycp:1356
msgid "yes"
msgstr ""
#. no - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/CommandLine.ycp:1354
+#: library/commandline/src/CommandLine.ycp:1359
msgid "no"
msgstr ""
#. error report
-#: library/control/src/ProductControl.ycp:813
+#: library/control/src/ProductControl.ycp:811
msgid "No workflow defined for this installation mode."
msgstr ""
#. message popup, %1 is a label of some widget
-#: library/cwm/src/CWM.ycp:626
+#: library/cwm/src/CWM.ycp:630
#, ycp-format
msgid "The value of %1 is invalid."
msgstr ""
@@ -598,37 +598,37 @@
msgstr ""
#. combobox header
-#: library/cwm/src/TablePopup.ycp:417
+#: library/cwm/src/TablePopup.ycp:413
msgid "&Selected Option"
msgstr ""
#. heading / label
-#: library/cwm/src/TablePopup.ycp:463
+#: library/cwm/src/TablePopup.ycp:459
msgid "Current Option: "
msgstr ""
#. error report
-#: library/cwm/src/TablePopup.ycp:663
+#: library/cwm/src/TablePopup.ycp:652
msgid "The selected option is already present."
msgstr ""
#. table header, shortcut for changed, keep very short
-#: library/cwm/src/TablePopup.ycp:835
+#: library/cwm/src/TablePopup.ycp:823
msgid "Ch."
msgstr ""
#. table header
-#: library/cwm/src/TablePopup.ycp:837 library/cwm/src/TablePopup.ycp:842
+#: library/cwm/src/TablePopup.ycp:825 library/cwm/src/TablePopup.ycp:830
msgid "Option"
msgstr ""
#. table header
-#: library/cwm/src/TablePopup.ycp:839 library/cwm/src/TablePopup.ycp:844
+#: library/cwm/src/TablePopup.ycp:827 library/cwm/src/TablePopup.ycp:832
msgid "Value"
msgstr ""
#. help 1/4
-#: library/cwm/src/TablePopup.ycp:848
+#: library/cwm/src/TablePopup.ycp:836
msgid ""
"<p><b><big>Editing the Settings</big></b><br>\n"
"To edit the settings, choose the appropriate\n"
@@ -636,21 +636,21 @@
msgstr ""
#. help 2/4, optional
-#: library/cwm/src/TablePopup.ycp:853
+#: library/cwm/src/TablePopup.ycp:841
msgid ""
"<p>To add a new option, click <b>Add</b>. To remove\n"
"an option, select it and click <b>Delete</b>.</p>"
msgstr ""
#. help 3/4, optional
-#: library/cwm/src/TablePopup.ycp:858
+#: library/cwm/src/TablePopup.ycp:846
msgid ""
"<P>The <B>Ch.</B> column of the table shows \n"
"whether the option was changed.</P>"
msgstr ""
#. help 4/4, optional
-#: library/cwm/src/TablePopup.ycp:863
+#: library/cwm/src/TablePopup.ycp:851
msgid ""
"<p>To reorder the options, select an option\n"
"and use <b>Up</b> and <b>Down</b> to move it up or down\n"
@@ -659,12 +659,12 @@
#. push button
#. Button label
-#: library/cwm/src/TablePopup.ycp:871 library/modules/Label.ycp:184
+#: library/cwm/src/TablePopup.ycp:859 library/modules/Label.ycp:184
msgid "&Up"
msgstr ""
#. push button
-#: library/cwm/src/TablePopup.ycp:873
+#: library/cwm/src/TablePopup.ycp:861
msgid "&Down"
msgstr ""
@@ -1277,176 +1277,43 @@
msgid "All changes will be lost!"
msgstr ""
-#. translators: summary header for messages generated through autoinstallation
-#: library/modules/Report.ycp:81
-msgid "Messages"
-msgstr ""
-
-#. Report configuration - will be normal messages displayed?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:86
-#, ycp-format
-msgid "Display Messages: %1"
-msgstr ""
-
-#. translators: summary if the messages should be displayed
-#. translators: summary if the messages should be written to log file
-#. translators: summary if the warnings should be displayed
-#. translators: summary if the warnings should be written to log file
-#. translators: summary if the errors should be displayed
-#. translators: summary if the errors should be written to log file
-#: library/modules/Report.ycp:88 library/modules/Report.ycp:96
-#: library/modules/Report.ycp:105 library/modules/Report.ycp:113
-#: library/modules/Report.ycp:122 library/modules/Report.ycp:130
-msgid "Yes"
-msgstr ""
-
-#. translators: summary if the errors should be written to log file
-#: library/modules/Report.ycp:88 library/modules/Report.ycp:96
-#: library/modules/Report.ycp:105 library/modules/Report.ycp:113
-#: library/modules/Report.ycp:122 library/modules/Report.ycp:132
-msgid "No"
-msgstr ""
-
-#. Report configuration - will have normal messages timeout?
-#. '%1' will be replaced by number of seconds
-#: library/modules/Report.ycp:91
-#, ycp-format
-msgid "Time-out Messages: %1"
-msgstr ""
-
-#. Report configuration - will be normal messages logged to file?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:94
-#, ycp-format
-msgid "Log Messages: %1"
-msgstr ""
-
-#. translators: summary header for warnings generated through autoinstallation
-#: library/modules/Report.ycp:99
-msgid "Warnings"
-msgstr ""
-
-#. Report configuration - will be warning messages displayed?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:103
-#, ycp-format
-msgid "Display Warnings: %1"
-msgstr ""
-
-#. Report configuration - will have warning messages timeout?
-#. '%1' will be replaced by number of seconds
-#: library/modules/Report.ycp:108
-#, ycp-format
-msgid "Time-out Warnings: %1"
-msgstr ""
-
-#. Report configuration - will be warning messages logged to file?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:111
-#, ycp-format
-msgid "Log Warnings: %1"
-msgstr ""
-
-#. translators: summary header for errors generated through autoinstallation
-#: library/modules/Report.ycp:116
-msgid "Errors"
-msgstr ""
-
-#. Report configuration - will be error messages displayed?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:120
-#, ycp-format
-msgid "Display Errors: %1"
-msgstr ""
-
-#. Report configuration - will have error messages timeout?
-#. '%1' will be replaced by number of seconds
-#: library/modules/Report.ycp:125
-#, ycp-format
-msgid "Time-out Errors: %1"
-msgstr ""
-
-#. Report configuration - will be error messages logged to file?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:128
-#, ycp-format
-msgid "Log Errors: %1"
-msgstr ""
-
-#. translators: warnings summary header
-#: library/modules/Report.ycp:635
-msgid "Warning:"
-msgid_plural "Warnings:"
-msgstr[0] ""
-msgstr[1] ""
-
-#. translators: errors summary header
-#: library/modules/Report.ycp:649
-msgid "Error:"
-msgid_plural "Errors:"
-msgstr[0] ""
-msgstr[1] ""
-
-#. translators: message summary header
-#: library/modules/Report.ycp:663 library/modules/Report.ycp:677
-msgid "Message:"
-msgid_plural "Messages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#. translators: summary if the module has not been used yet in AutoYaST profile
-#: library/modules/Summary.ycp:49
-msgid "Not configured yet."
-msgstr ""
-
-#. translators: summary if no hardware was detected
-#: library/modules/Summary.ycp:65
-msgid "Not detected."
-msgstr ""
-
#. translators: Tree header
#: library/modules/ValueBrowser.ycp:141
msgid "&Variable"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:104
+#: library/network/src/CWMFirewallInterfaces.ycp:77
msgid "Firewall is disabled"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:109
+#: library/network/src/CWMFirewallInterfaces.ycp:82
msgid "Firewall port is closed"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:114
+#: library/network/src/CWMFirewallInterfaces.ycp:87
msgid "Firewall port is open on all interfaces"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:119
+#: library/network/src/CWMFirewallInterfaces.ycp:92
msgid "Firewall port is open on selected interfaces"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:124
+#: library/network/src/CWMFirewallInterfaces.ycp:97
msgid "No network interfaces are configured"
msgstr ""
-#. multi selection box item
-#: library/network/src/CWMFirewallInterfaces.ycp:186
-msgid "All NetworkManager Interfaces"
-msgstr ""
-
#. transaltors: selection box title
-#: library/network/src/CWMFirewallInterfaces.ycp:365
+#: library/network/src/CWMFirewallInterfaces.ycp:278
msgid "&Network Interfaces with Open Port in Firewall"
msgstr ""
#. question popup
-#: library/network/src/CWMFirewallInterfaces.ycp:431
+#: library/network/src/CWMFirewallInterfaces.ycp:338
msgid ""
"No interface is selected. Service will not\n"
"be available for other computers.\n"
@@ -1455,7 +1322,7 @@
msgstr ""
#. yes-no popup
-#: library/network/src/CWMFirewallInterfaces.ycp:475
+#: library/network/src/CWMFirewallInterfaces.ycp:358
#, ycp-format
msgid ""
"Because of SuSE Firewall settings, the port\n"
@@ -1466,7 +1333,7 @@
msgstr ""
#. yes-no popup
-#: library/network/src/CWMFirewallInterfaces.ycp:492
+#: library/network/src/CWMFirewallInterfaces.ycp:373
#, ycp-format
msgid ""
"Because of SuSE Firewall settings, the port\n"
@@ -1477,23 +1344,23 @@
msgstr ""
#. translators: selection box title
-#: library/network/src/CWMFirewallInterfaces.ycp:569
+#: library/network/src/CWMFirewallInterfaces.ycp:450
msgid "Network &Interfaces with Open Port in Firewall"
msgstr ""
#. push button to select all network intefaces for firewall
-#: library/network/src/CWMFirewallInterfaces.ycp:578
+#: library/network/src/CWMFirewallInterfaces.ycp:459
msgid "Select &All"
msgstr ""
#. push button to deselect all network intefaces for firewall
-#: library/network/src/CWMFirewallInterfaces.ycp:581
+#: library/network/src/CWMFirewallInterfaces.ycp:462
msgid "Select &None"
msgstr ""
#. help text for firewall settings widget 1/3,
#. %1 is check box label, eg. "Open Port in Firewall" (without quotes)
-#: library/network/src/CWMFirewallInterfaces.ycp:799
+#: library/network/src/CWMFirewallInterfaces.ycp:680
#, ycp-format
msgid ""
"<p><b><big>Firewall Settings</big></b><br>\n"
@@ -1504,7 +1371,7 @@
#. help text for firewall port openning widget 2/3, optional
#. %1 is push button label, eg. "Firewall &Details" (without quotes)
#. note: %2 is correct, do not replace with %1!!!
-#: library/network/src/CWMFirewallInterfaces.ycp:807
+#: library/network/src/CWMFirewallInterfaces.ycp:688
#, ycp-format
msgid ""
"To select interfaces on which to open the port,\n"
@@ -1512,46 +1379,37 @@
msgstr ""
#. help text for firewall settings widget 3/3,
-#: library/network/src/CWMFirewallInterfaces.ycp:811
+#: library/network/src/CWMFirewallInterfaces.ycp:692
msgid ""
"This option is available only if the firewall\n"
"is enabled.</p>"
msgstr ""
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/network/src/CWMFirewallInterfaces.ycp:824
+#: library/network/src/CWMFirewallInterfaces.ycp:705
msgid "Open Port in Firewall"
msgstr ""
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/network/src/CWMFirewallInterfaces.ycp:826
+#: library/network/src/CWMFirewallInterfaces.ycp:707
msgid "Firewall Details"
msgstr ""
#. check box
-#: library/network/src/CWMFirewallInterfaces.ycp:855
+#: library/network/src/CWMFirewallInterfaces.ycp:736
msgid "Open Port in &Firewall"
msgstr ""
#. push button
-#: library/network/src/CWMFirewallInterfaces.ycp:858
+#: library/network/src/CWMFirewallInterfaces.ycp:739
msgid "Firewall &Details"
msgstr ""
#. label text
-#: library/network/src/CWMFirewallInterfaces.ycp:887
+#: library/network/src/CWMFirewallInterfaces.ycp:768
msgid "Firewall is open"
msgstr ""
-#. TRANSLATORS: pop-up question when reading the service configuration
-#: library/network/src/NetworkService.ycp:108
-msgid ""
-"Your network interfaces are currently controlled by NetworkManager\n"
-"but the service to configure might not work well with it.\n"
-"\n"
-"Really continue?"
-msgstr ""
-
#. TRANSLATORS: popup informing message, allowed characters for port-names
#: library/network/src/PortAliases.ycp:112
msgid ""
@@ -1561,39 +1419,39 @@
msgstr ""
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/SuSEFirewall.ycp:79
+#: library/network/src/SuSEFirewall.ycp:72
msgid "External Zone"
msgstr ""
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/SuSEFirewall.ycp:81
+#: library/network/src/SuSEFirewall.ycp:74
msgid "Internal Zone"
msgstr ""
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/SuSEFirewall.ycp:83
+#: library/network/src/SuSEFirewall.ycp:76
msgid "Demilitarized Zone"
msgstr ""
#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
-#: library/network/src/SuSEFirewall.ycp:1140
+#: library/network/src/SuSEFirewall.ycp:1103
msgid "Unknown Zone"
msgstr ""
#. TRANSLATORS: a popup error message
-#: library/network/src/SuSEFirewall.ycp:1360
+#: library/network/src/SuSEFirewall.ycp:1323
#, ycp-format
msgid "Cannot enable service '%1'."
msgstr ""
#. TRANSLATORS: a popup error message
-#: library/network/src/SuSEFirewall.ycp:1382
+#: library/network/src/SuSEFirewall.ycp:1345
#, ycp-format
msgid "Cannot disable service '%1'."
msgstr ""
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/SuSEFirewall.ycp:1497
+#: library/network/src/SuSEFirewall.ycp:1458
#, ycp-format
msgid ""
"Interface '%1' is included in multiple firewall zones.\n"
@@ -1604,8 +1462,8 @@
msgstr ""
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/SuSEFirewall.ycp:1782
-#: library/network/src/SuSEFirewall.ycp:1843
+#: library/network/src/SuSEFirewall.ycp:1730
+#: library/network/src/SuSEFirewall.ycp:1787
#, ycp-format
msgid ""
"Interface '%1' is not assigned to any firewall zone.\n"
@@ -1613,78 +1471,78 @@
msgstr ""
#. TRANSLATORS: Dialog caption
-#: library/network/src/SuSEFirewall.ycp:2175
+#: library/network/src/SuSEFirewall.ycp:2111
msgid "Initializing Firewall Configuration"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2180
+#: library/network/src/SuSEFirewall.ycp:2116
msgid "Check for network devices"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2182
+#: library/network/src/SuSEFirewall.ycp:2118
msgid "Read current configuration"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2184
+#: library/network/src/SuSEFirewall.ycp:2120
msgid "Check possibly conflicting services"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2188
+#: library/network/src/SuSEFirewall.ycp:2124
msgid "Checking for network devices..."
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2190
+#: library/network/src/SuSEFirewall.ycp:2126
msgid "Reading current configuration..."
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2192
+#: library/network/src/SuSEFirewall.ycp:2128
msgid "Checking possibly conflicting services..."
msgstr ""
#. TRANSLATORS: Dialog caption
-#: library/network/src/SuSEFirewall.ycp:2291
+#: library/network/src/SuSEFirewall.ycp:2227
msgid "Writing Firewall Configuration"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2296
+#: library/network/src/SuSEFirewall.ycp:2232
msgid "Write firewall settings"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2298
+#: library/network/src/SuSEFirewall.ycp:2234
msgid "Adjust firewall service"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2302
+#: library/network/src/SuSEFirewall.ycp:2238
msgid "Writing firewall settings..."
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2304
+#: library/network/src/SuSEFirewall.ycp:2240
msgid "Adjusting firewall service..."
msgstr ""
#. TRANSLATORS: a popup error message
-#: library/network/src/SuSEFirewall.ycp:2320
+#: library/network/src/SuSEFirewall.ycp:2256
msgid "Writing settings failed"
msgstr ""
#. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
-#: library/network/src/SuSEFirewallProposal.ycp:137
+#: library/network/src/SuSEFirewallProposal.ycp:136
#, ycp-format
msgid "New network device '%1' found; added as an internal firewall interface"
msgstr ""
#. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
-#: library/network/src/SuSEFirewallProposal.ycp:144
+#: library/network/src/SuSEFirewallProposal.ycp:143
#, ycp-format
msgid "New network device '%1' found; added as an external firewall interface"
msgstr ""
@@ -1692,7 +1550,7 @@
#. TRANSLATORS: Proposal informative text "Firewall is enabled" with link around
#. "enabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:349
+#: library/network/src/SuSEFirewallProposal.ycp:330
#, ycp-format
msgid "Firewall is %1enabled%2"
msgstr ""
@@ -1700,7 +1558,7 @@
#. TRANSLATORS: Proposal informative text "Firewall is disabled" with link around
#. "disabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:354
+#: library/network/src/SuSEFirewallProposal.ycp:335
#, ycp-format
msgid "Firewall is %1disabled%2"
msgstr ""
@@ -1708,7 +1566,7 @@
#. TRANSLATORS: Network proposal informative text "SSH is enabled" with link around
#. "enabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:384
+#: library/network/src/SuSEFirewallProposal.ycp:353
#, ycp-format
msgid "SSH port is %1open%2"
msgstr ""
@@ -1716,20 +1574,20 @@
#. TRANSLATORS: Network proposal informative text "SSH is disabled" with link around
#. "disabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:389
+#: library/network/src/SuSEFirewallProposal.ycp:358
#, ycp-format
msgid "SSH port is %1blocked%2"
msgstr ""
#. TRANSLATORS: This is a warning message. Installation over SSH without SSH allowed on firewall
-#: library/network/src/SuSEFirewallProposal.ycp:395
-msgid "You are installing a system over SSH, but you have not opened the SSH port on the firewall."
+#: library/network/src/SuSEFirewallProposal.ycp:364
+msgid "You are installing system over the SSH but you have not opened the SSH port on the firewall."
msgstr ""
#. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is enabled" with link around
#. "enabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:414
+#: library/network/src/SuSEFirewallProposal.ycp:383
#, ycp-format
msgid "Remote Administration (VNC) ports are %1open%2"
msgstr ""
@@ -1737,14 +1595,14 @@
#. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is disabled" with link around
#. "disabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:419
+#: library/network/src/SuSEFirewallProposal.ycp:388
#, ycp-format
msgid "Remote Administration (VNC) ports are %1blocked%2"
msgstr ""
#. TRANSLATORS: This is a warning message. Installation over VNC without VNC allowed on firewall
-#: library/network/src/SuSEFirewallProposal.ycp:424
-msgid "You are installing a system using remote administration (VNC), but you have not opened the VNC ports on the firewall."
+#: library/network/src/SuSEFirewallProposal.ycp:393
+msgid "You are installing system over the Remote Administration (VNC) but you have not opened the VNC ports on the firewall."
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
@@ -1878,43 +1736,49 @@
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:185
+#: library/network/src/SuSEFirewallServices.ycp:183
msgid "Remote Access to Display Manager"
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:193
+#: library/network/src/SuSEFirewallServices.ycp:191
msgid "Remote File Alteration Monitor"
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:199
+#: library/network/src/SuSEFirewallServices.ycp:197
msgid "Portable Batch System (PBS)"
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:206
+#: library/network/src/SuSEFirewallServices.ycp:204
msgid "MySQL Remote Access"
msgstr ""
#. TRANSLATORS: Name of unknown service. This should never happen, just for cases..., %1 is a requested service id like nis-server
-#: library/network/src/SuSEFirewallServices.ycp:236
+#: library/network/src/SuSEFirewallServices.ycp:234
#, ycp-format
msgid "Unknown service '%1'"
msgstr ""
#. Popup when initializing the package manager
+#. popup when initializing the package manager
#: library/packages/src/PackageSystem.ycp:77
+#: library/packages/src/Require.ycp:75
msgid "Reading package information..."
msgstr ""
#. Error message, no packages sources found
+#. error popup, no packages sources
+#. FIXME: translation
#: library/packages/src/PackageSystem.ycp:99
+#: library/packages/src/Require.ycp:87
msgid "No package source defined."
msgstr ""
#. popup heading, with rich text widget and Yes/No buttons
#: library/packages/src/PackageSystem.ycp:128
+#: library/packages/src/Require.ycp:343
msgid "Do you accept this license agreement?"
msgid_plural "Do you accept these license agreements?"
msgstr[0] ""
@@ -1945,14 +1809,19 @@
"packages, YaST may not work properly.\n"
msgstr ""
+#. this is a separator used at merging package list items
+#: library/packages/src/common.ycp:83
+msgid ", "
+msgstr ""
+
#. the message is followed by list of required packages
#. Popup Text
-#: library/packages/src/common.ycp:84 library/packages/src/common.ycp:108
+#: library/packages/src/common.ycp:85 library/packages/src/common.ycp:109
msgid "These packages need to be installed:"
msgstr ""
#. Popup Text
-#: library/packages/src/common.ycp:110
+#: library/packages/src/common.ycp:111
msgid "These packages need to be removed:"
msgstr ""
@@ -2064,22 +1933,22 @@
msgstr ""
#. KiloByte abbreviated
-#: library/types/src/String.ycp:96
+#: library/types/src/String.ycp:80
msgid "KB"
msgstr ""
#. MegaByte abbreviated
-#: library/types/src/String.ycp:98
+#: library/types/src/String.ycp:82
msgid "MB"
msgstr ""
#. GigaByte abbreviated
-#: library/types/src/String.ycp:100
+#: library/types/src/String.ycp:84
msgid "GB"
msgstr ""
#. TeraByte abbreviated
-#: library/types/src/String.ycp:102
+#: library/types/src/String.ycp:86
msgid "TB"
msgstr ""
@@ -2155,6 +2024,134 @@
msgid "&Exported Directories"
msgstr ""
+#. translators: summary header for messages generated through autoinstallation
+#: library/wizard/src/Report.ycp:81
+msgid "Messages"
+msgstr ""
+
+#. Report configuration - will be normal messages displayed?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:86
+#, ycp-format
+msgid "Display Messages: %1"
+msgstr ""
+
+#. translators: summary if the messages should be displayed
+#. translators: summary if the messages should be written to log file
+#. translators: summary if the warnings should be displayed
+#. translators: summary if the warnings should be written to log file
+#. translators: summary if the errors should be displayed
+#. translators: summary if the errors should be written to log file
+#: library/wizard/src/Report.ycp:88 library/wizard/src/Report.ycp:96
+#: library/wizard/src/Report.ycp:105 library/wizard/src/Report.ycp:113
+#: library/wizard/src/Report.ycp:122 library/wizard/src/Report.ycp:130
+msgid "Yes"
+msgstr ""
+
+#. translators: summary if the errors should be written to log file
+#: library/wizard/src/Report.ycp:88 library/wizard/src/Report.ycp:96
+#: library/wizard/src/Report.ycp:105 library/wizard/src/Report.ycp:113
+#: library/wizard/src/Report.ycp:122 library/wizard/src/Report.ycp:132
+msgid "No"
+msgstr ""
+
+#. Report configuration - will have normal messages timeout?
+#. '%1' will be replaced by number of seconds
+#: library/wizard/src/Report.ycp:91
+#, ycp-format
+msgid "Time-out Messages: %1"
+msgstr ""
+
+#. Report configuration - will be normal messages logged to file?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:94
+#, ycp-format
+msgid "Log Messages: %1"
+msgstr ""
+
+#. translators: summary header for warnings generated through autoinstallation
+#: library/wizard/src/Report.ycp:99
+msgid "Warnings"
+msgstr ""
+
+#. Report configuration - will be warning messages displayed?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:103
+#, ycp-format
+msgid "Display Warnings: %1"
+msgstr ""
+
+#. Report configuration - will have warning messages timeout?
+#. '%1' will be replaced by number of seconds
+#: library/wizard/src/Report.ycp:108
+#, ycp-format
+msgid "Time-out Warnings: %1"
+msgstr ""
+
+#. Report configuration - will be warning messages logged to file?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:111
+#, ycp-format
+msgid "Log Warnings: %1"
+msgstr ""
+
+#. translators: summary header for errors generated through autoinstallation
+#: library/wizard/src/Report.ycp:116
+msgid "Errors"
+msgstr ""
+
+#. Report configuration - will be error messages displayed?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:120
+#, ycp-format
+msgid "Display Errors: %1"
+msgstr ""
+
+#. Report configuration - will have error messages timeout?
+#. '%1' will be replaced by number of seconds
+#: library/wizard/src/Report.ycp:125
+#, ycp-format
+msgid "Time-out Errors: %1"
+msgstr ""
+
+#. Report configuration - will be error messages logged to file?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:128
+#, ycp-format
+msgid "Log Errors: %1"
+msgstr ""
+
+#. translators: warnings summary header
+#: library/wizard/src/Report.ycp:635
+msgid "Warning:"
+msgid_plural "Warnings:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: errors summary header
+#: library/wizard/src/Report.ycp:649
+msgid "Error:"
+msgid_plural "Errors:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: message summary header
+#: library/wizard/src/Report.ycp:663 library/wizard/src/Report.ycp:677
+msgid "Message:"
+msgid_plural "Messages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: summary if the module has not been used yet in AutoYaST profile
+#: library/wizard/src/Summary.ycp:49
+msgid "Not configured yet."
+msgstr ""
+
+#. translators: summary if no hardware was detected
+#: library/wizard/src/Summary.ycp:65
+msgid "Not detected."
+msgstr ""
+
#. button text
#: library/wizard/src/Wizard.ycp:153 library/wizard/src/Wizard.ycp:306
msgid "&Apply"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/configure new/yast2-2.13.41/configure
--- old/yast2-2.13.40/configure 2006-03-22 13:03:53.000000000 +0100
+++ new/yast2-2.13.41/configure 2006-03-29 17:06:37.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 2.13.40.
+# Generated by GNU Autoconf 2.59 for yast2 2.13.41.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.13.40'
-PACKAGE_STRING='yast2 2.13.40'
+PACKAGE_VERSION='2.13.41'
+PACKAGE_STRING='yast2 2.13.41'
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 2.13.40 to adapt to many kinds of systems.
+\`configure' configures yast2 2.13.41 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 2.13.40:";;
+ short | recursive ) echo "Configuration of yast2 2.13.41:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.13.40
+yast2 configure 2.13.41
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 $as_me 2.13.40, which was
+It was created by yast2 $as_me 2.13.41, 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'
- VERSION='2.13.40'
+ VERSION='2.13.41'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.40"
+VERSION="2.13.41"
RPMNAME="yast2"
MAINTAINER="Stanislav Visnovsky "
@@ -2797,7 +2797,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2 $as_me 2.13.40, which was
+This file was extended by yast2 $as_me 2.13.41, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2852,7 +2852,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.13.40
+yast2 config.status 2.13.41
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-2.13.40/configure.in new/yast2-2.13.41/configure.in
--- old/yast2-2.13.40/configure.in 2006-03-22 13:03:49.000000000 +0100
+++ new/yast2-2.13.41/configure.in 2006-03-29 17:06:24.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.13.40, http://www.suse.de/feedback, yast2)
+AC_INIT(yast2, 2.13.41, http://www.suse.de/feedback, yast2)
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.40"
+VERSION="2.13.41"
RPMNAME="yast2"
MAINTAINER="Stanislav Visnovsky "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/modules/Version.ycp new/yast2-2.13.41/library/modules/Version.ycp
--- old/yast2-2.13.40/library/modules/Version.ycp 2006-03-22 13:04:05.000000000 +0100
+++ new/yast2-2.13.41/library/modules/Version.ycp 2006-03-29 17:07:15.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.13.40";
+global string yast2 = "2.13.41";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/Makefile.am new/yast2-2.13.41/library/packages/src/Makefile.am
--- old/yast2-2.13.40/library/packages/src/Makefile.am 2006-02-03 08:47:25.000000000 +0100
+++ new/yast2-2.13.41/library/packages/src/Makefile.am 2006-03-28 18:46:35.000000000 +0200
@@ -5,6 +5,7 @@
YCPCFLAGS = -M ../../modules/ -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src
module_DATA = \
+ PackageLock.ycp \
Package.ycp \
PackageAI.ycp \
PackageSystem.ycp \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/Makefile.in new/yast2-2.13.41/library/packages/src/Makefile.in
--- old/yast2-2.13.40/library/packages/src/Makefile.in 2006-03-22 13:03:59.000000000 +0100
+++ new/yast2-2.13.41/library/packages/src/Makefile.in 2006-03-29 17:06:54.000000000 +0200
@@ -174,6 +174,7 @@
ystartupdir = @ystartupdir@
YCPCFLAGS = -M ../../modules/ -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src
module_DATA = \
+ PackageLock.ycp \
Package.ycp \
PackageAI.ycp \
PackageSystem.ycp \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/PackageLock.ycp new/yast2-2.13.41/library/packages/src/PackageLock.ycp
--- old/yast2-2.13.40/library/packages/src/PackageLock.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.13.41/library/packages/src/PackageLock.ycp 2006-03-29 15:32:27.000000000 +0200
@@ -0,0 +1,42 @@
+/**
+ * File: modules/PackageLock.ycp
+ * Package: yast2
+ * Summary: Packages manipulation (system)
+ * Authors: Martin Vidner
+ *
+ * $Id: PackageLock.ycp 29512 2006-03-29 13:32:23Z mvidner $
+ *
+ * This should be used everywhere before Pkg is first used. #160319
+ */
+
+{
+
+module "PackageLock";
+textdomain "base";
+
+import "Report";
+
+boolean have_lock = nil;
+/**
+ * Tries to acquire the packager (zypp) lock.
+ * Reports an error if another process has the lock already.
+ * Will only report once even if called multiple times.
+ * @return true if we can continue
+ */
+global boolean Check () {
+ if (have_lock == nil)
+ {
+ // Invoke a cheap call that accesses the zypp lock
+ have_lock = Pkg::Connect () == true; // nil guard
+ if (!have_lock)
+ {
+ Report::Error (_("Another process is accessing the package database.
+Package management will not work!"));
+ // ContinueCancel? What about CLI?
+ }
+ }
+ return have_lock;
+}
+
+
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/PackageSystem.ycp new/yast2-2.13.41/library/packages/src/PackageSystem.ycp
--- old/yast2-2.13.40/library/packages/src/PackageSystem.ycp 2006-02-20 12:08:10.000000000 +0100
+++ new/yast2-2.13.41/library/packages/src/PackageSystem.ycp 2006-03-29 17:04:49.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Martin Vidner
* Michal Svec
*
- * $Id: PackageSystem.ycp 27893 2006-02-13 12:08:32Z lslezak $
+ * $Id: PackageSystem.ycp 29534 2006-03-29 15:04:45Z mvidner $
*
* The documentation is maintained at
* <a href="../index.html">.../docs/index.html</a>.
@@ -18,6 +18,7 @@
import "Mode";
import "PackageCallbacksInit";
+import "PackageLock";
import "Report";
import "Stage";
import "CommandLine";
@@ -52,6 +53,7 @@
* This may become superfluous.
*/
global void EnsureTargetInit() {
+ PackageLock::Check ();
PackageCallbacksInit::InitPackageCallbacks ();
// target_initialized = target_initialized || Pkg::TargetInit ("/", false);
// always initizalize target, it should be cheap according to #45356
@@ -62,6 +64,7 @@
* Ensure that Pkg:: calls working with the installation sources work
*/
global void EnsureSourceInit() {
+ PackageLock::Check ();
if(source_initialized)
{
// this way, if somebody closed the cache outside of Package
@@ -110,6 +113,11 @@
global boolean DoInstallAndRemove(list<string> toinstall, list<string> toremove) {
y2debug ("toinstall: %1, toremove: %2", toinstall, toremove);
+ if (!PackageLock::Check ())
+ {
+ return false;
+ }
+
EnsureSourceInit ();
EnsureTargetInit ();
boolean ok = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/runlevel/src/Service.ycp new/yast2-2.13.41/library/runlevel/src/Service.ycp
--- old/yast2-2.13.40/library/runlevel/src/Service.ycp 2006-02-13 12:22:17.000000000 +0100
+++ new/yast2-2.13.41/library/runlevel/src/Service.ycp 2006-03-28 13:46:13.000000000 +0200
@@ -6,7 +6,7 @@
* Petr Blahos
* Michal Svec
*
- * $Id: Service.ycp 27885 2006-02-13 11:22:17Z locilka $
+ * $Id: Service.ycp 29400 2006-03-27 08:26:00Z locilka $
*
* Functions for service (init script) handling used by other modules.
*/
@@ -293,7 +293,7 @@
*/
global define integer RunInitScriptWithTimeOut (string name, string param) {
y2milestone("Running service initscript %1 %2", name, param);
- string command = sformat ("TERM=raw %2/%1 %3", name, init_d, param);
+ string command = sformat ("TERM=dumb %2/%1 %3", name, init_d, param);
// default return code
integer return_code = nil;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...