Hello community,
here is the log from the commit of package yast2-packager
checked in at Wed Apr 12 13:02:14 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-04-11 18:46:06.000000000 +0200
+++ STABLE/yast2-packager/yast2-packager.changes 2006-04-12 12:42:06.000000000 +0200
@@ -1,0 +2,22 @@
+Wed Apr 12 12:31:15 CEST 2006 - jsuchome@suse.cz
+
+- enable saving the sources if rug reports errors (#165478)
+- 2.13.80
+
+-------------------------------------------------------------------
+Wed Apr 12 12:22:31 CEST 2006 - locilka@suse.cz
+
+- Merged text from proofreading
+
+-------------------------------------------------------------------
+Wed Apr 12 11:20:27 CEST 2006 - mvidner@suse.cz
+
+- Increased the timeout for ZMD source syncing to 30 minutes (#165145).
+- 2.13.79
+
+-------------------------------------------------------------------
+Tue Apr 11 19:09:08 CEST 2006 - jsrain@suse.de
+
+- display selected patterns in simple proposal (#162281)
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.78.tar.bz2
New:
----
yast2-packager-2.13.80.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.86rh3h/_old 2006-04-12 13:01:18.000000000 +0200
+++ /var/tmp/diff_new_pack.86rh3h/_new 2006-04-12 13:01:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.78)
+# spec file for package yast2-packager (Version 2.13.80)
#
# 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-packager
-Version: 2.13.78
+Version: 2.13.80
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.78.tar.bz2
+Source0: yast2-packager-2.13.80.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml
Requires: yast2 yast2-installation checkmedia yast2-country
@@ -41,7 +41,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.13.78
+%setup -n yast2-packager-2.13.80
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,16 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Wed Apr 12 2006 - jsuchome@suse.cz
+- enable saving the sources if rug reports errors (#165478)
+- 2.13.80
+* Wed Apr 12 2006 - locilka@suse.cz
+- Merged text from proofreading
+* Wed Apr 12 2006 - mvidner@suse.cz
+- Increased the timeout for ZMD source syncing to 30 minutes (#165145).
+- 2.13.79
+* Tue Apr 11 2006 - jsrain@suse.de
+- display selected patterns in simple proposal (#162281)
* Tue Apr 11 2006 - jsrain@suse.de
- select laptop pattern on laptops (#165155)
- 2.13.78
++++++ yast2-packager-2.13.78.tar.bz2 -> yast2-packager-2.13.80.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.78/Makefile.am new/yast2-packager-2.13.80/Makefile.am
--- old/yast2-packager-2.13.78/Makefile.am 2006-04-11 18:45:28.000000000 +0200
+++ new/yast2-packager-2.13.80/Makefile.am 2006-04-07 11:33:00.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 check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,9 +199,6 @@
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-packager-2.13.78/Makefile.in new/yast2-packager-2.13.80/Makefile.in
--- old/yast2-packager-2.13.78/Makefile.in 2006-04-11 18:45:35.000000000 +0200
+++ new/yast2-packager-2.13.80/Makefile.in 2006-04-07 11:33:06.000000000 +0200
@@ -783,7 +783,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -826,9 +826,6 @@
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-packager-2.13.78/VERSION new/yast2-packager-2.13.80/VERSION
--- old/yast2-packager-2.13.78/VERSION 2006-04-11 18:40:34.000000000 +0200
+++ new/yast2-packager-2.13.80/VERSION 2006-04-12 12:32:21.000000000 +0200
@@ -1 +1 @@
-2.13.78
+2.13.80
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.78/configure new/yast2-packager-2.13.80/configure
--- old/yast2-packager-2.13.78/configure 2006-04-11 18:45:32.000000000 +0200
+++ new/yast2-packager-2.13.80/configure 2006-04-07 11:33:04.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-packager 2.13.78.
+# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.70.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.13.78'
-PACKAGE_STRING='yast2-packager 2.13.78'
+PACKAGE_VERSION='2.13.70'
+PACKAGE_STRING='yast2-packager 2.13.70'
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-packager 2.13.78 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.13.70 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-packager 2.13.78:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.13.70:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.13.78
+yast2-packager configure 2.13.70
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-packager $as_me 2.13.78, which was
+It was created by yast2-packager $as_me 2.13.70, 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-packager'
- VERSION='2.13.78'
+ VERSION='2.13.70'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.78"
+VERSION="2.13.70"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
@@ -2695,7 +2695,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-packager $as_me 2.13.78, which was
+This file was extended by yast2-packager $as_me 2.13.70, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2750,7 +2750,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.13.78
+yast2-packager config.status 2.13.70
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-packager-2.13.78/configure.in new/yast2-packager-2.13.80/configure.in
--- old/yast2-packager-2.13.78/configure.in 2006-04-11 18:45:28.000000000 +0200
+++ new/yast2-packager-2.13.80/configure.in 2006-04-07 11:33:00.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.78, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.70, http://www.suse.de/feedback, yast2-packager)
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.78"
+VERSION="2.13.70"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.78/packager.pot new/yast2-packager-2.13.80/packager.pot
--- old/yast2-packager-2.13.78/packager.pot 2006-03-25 17:15:06.000000000 +0100
+++ new/yast2-packager-2.13.80/packager.pot 2006-03-14 08:45:21.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-25 09:15-0700\n"
+"POT-Creation-Date: 2006-03-14 08:45+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -220,6 +220,13 @@
msgid "Building directory image..."
msgstr ""
+#. an error popup
+#: src/clients/inst_kickoff.ycp:130 src/clients/inst_kickoff.ycp:166
+#: src/clients/inst_kickoff.ycp:194
+#, ycp-format
+msgid "Backup of %1 failed. See %2 for details."
+msgstr ""
+
#. part of item in summary
#: src/clients/inst_media.ycp:30 src/clients/inst_media.ycp:31
#: src/modules/SourceManager.ycp:659
@@ -379,7 +386,7 @@
msgstr ""
#. Intermediate contents of the software selection screen
-#: src/clients/inst_selections.ycp:45 src/modules/Packages.ycp:1108
+#: src/clients/inst_selections.ycp:45
msgid "Initializing catalogs..."
msgstr ""
@@ -862,17 +869,17 @@
msgstr ""
#. error popup, %1 is the name of the .rpm package
-#: src/clients/sw_single.ycp:126 src/modules/PackageCallbacks.ycp:188
+#: src/clients/sw_single.ycp:125 src/modules/PackageCallbacks.ycp:188
#, ycp-format
msgid "Package %1 was not found on the medium."
msgstr ""
#. label of popup
-#: src/clients/sw_single.ycp:162
+#: src/clients/sw_single.ycp:159
msgid "Reading package information..."
msgstr ""
-#: src/clients/sw_single.ycp:221
+#: src/clients/sw_single.ycp:218
msgid ""
"During the last package installation,\n"
"several package failed to install.\n"
@@ -880,7 +887,7 @@
msgstr ""
#. error report, %1 is a list of packages
-#: src/clients/sw_single.ycp:255
+#: src/clients/sw_single.ycp:252
#, ycp-format
msgid ""
"Following packages haven't been found on the medium:\n"
@@ -888,10 +895,34 @@
msgstr ""
#. Popup dialog contents
-#: src/clients/sw_single.ycp:311
+#: src/clients/sw_single.ycp:308
msgid "Install or remove more packages?"
msgstr ""
+#: src/config/dirinstall.glade:16
+msgid "Directory Installation"
+msgstr ""
+
+#: src/config/dirinstall.glade:35
+msgid "Installation"
+msgstr ""
+
+#: src/config/dirinstall.glade:39
+msgid "Settings"
+msgstr ""
+
+#: src/config/dirinstall.glade:44 src/config/dirinstall.glade:48
+msgid "Prepare Installation"
+msgstr ""
+
+#: src/config/dirinstall.glade:52
+msgid "Install Packages"
+msgstr ""
+
+#: src/config/dirinstall.glade:56
+msgid "Finish Installation"
+msgstr ""
+
#. %1 = CD identification
#: src/include/checkmedia/ui.ycp:73
#, ycp-format
@@ -1675,19 +1706,19 @@
msgstr ""
#. error in proposal, %1 is URL
-#: src/modules/Packages.ycp:526
+#: src/modules/Packages.ycp:525
#, ycp-format
msgid "No catalog found at '%1'."
msgstr ""
#. message popup, %1 is product name
-#: src/modules/Packages.ycp:534
+#: src/modules/Packages.ycp:533
#, ycp-format
msgid "Insert %1 CD 1"
msgstr ""
#. an error message
-#: src/modules/Packages.ycp:594
+#: src/modules/Packages.ycp:593
#, ycp-format
msgid ""
"Error while initializing package descriptions.\n"
@@ -1695,51 +1726,51 @@
msgstr ""
#. warning text, part 1
-#: src/modules/Packages.ycp:620
+#: src/modules/Packages.ycp:619
msgid "Your computer is a 64-bit x86-64 system."
msgstr ""
#. warning text, part 2
-#: src/modules/Packages.ycp:622
+#: src/modules/Packages.ycp:621
msgid "However, you are trying to install a 32-bit distribution."
msgstr ""
#. popup label
-#: src/modules/Packages.ycp:721
+#: src/modules/Packages.ycp:720
msgid "Evaluating package selection..."
msgstr ""
#. warning in the summary
-#: src/modules/Packages.ycp:808
+#: src/modules/Packages.ycp:807
msgid "Disk Space Exhausted"
msgstr ""
#. warning in the summary
-#: src/modules/Packages.ycp:822 src/modules/Packages.ycp:885
-#: src/modules/Packages.ycp:1078
+#: src/modules/Packages.ycp:821 src/modules/Packages.ycp:884
+#: src/modules/Packages.ycp:1077
msgid "Not enough disk space. Remove some packages in the single selection."
msgstr ""
#. the selected set of software packages does not fit on the harddisk
#. error message
-#: src/modules/Packages.ycp:836
+#: src/modules/Packages.ycp:835
msgid "Disk space exhausted -- changing software selection"
msgstr ""
#. Can't find any software data, probably a installation media error
#. error message
-#: src/modules/Packages.ycp:859
+#: src/modules/Packages.ycp:858
msgid "Cannot read package data from installation media. Media error?"
msgstr ""
#. can't find a set of software packages which fits on the harddisk
#. error message
-#: src/modules/Packages.ycp:916
+#: src/modules/Packages.ycp:915
msgid "Not enough disk space even for a minimal installation!"
msgstr ""
#. part of summary, %1 is size of packages (in MB or GB)
-#: src/modules/Packages.ycp:1071
+#: src/modules/Packages.ycp:1070
#, ycp-format
msgid "Size of Packages to Install: %1"
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.78/src/clients/inst_source.ycp new/yast2-packager-2.13.80/src/clients/inst_source.ycp
--- old/yast2-packager-2.13.78/src/clients/inst_source.ycp 2006-04-06 19:38:01.000000000 +0200
+++ new/yast2-packager-2.13.80/src/clients/inst_source.ycp 2006-04-12 12:27:16.000000000 +0200
@@ -203,7 +203,14 @@
list<integer> deleted = newSources (sourceStatesOut, sourceStatesIn);
boolean have_rug = (integer)SCR::Read (.target.size, "/usr/bin/rug") >= 0;
if (have_rug) {
- success = success && SourceManager::SyncAddedAndDeleted (added, deleted);
+ if (success && !SourceManager::SyncAddedAndDeleted (added, deleted))
+ {
+ // yes/no popup
+ if (!Popup::YesNo (_("Source synchronization with ZMD failed.
+Save changes anyway?")))
+ success = false;
+
+ }
}
else {
y2milestone ("No rug, not syncing");
@@ -504,14 +511,15 @@
else if ( input == `next )
{
// store the new state
- boolean success = Write();
+ boolean success = Write();
if ( !success ) {
// popup message part 1
string _msg1 = _("Unable to save changes to installation source
configuration.");
- string err = Pkg::LastErrorId();
+ string details = Pkg::LastError();
// popup message part 2 followed by other info
- string _msg2 = _("Details:") + "\n" + Pkg::LastError();
+ string _msg2 = details != "" ? (_("Details:") + "\n" + details)
+ : "";
// popup message part 3
_msg2 = _msg2 + "\n" + _("Try again?");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.78/src/modules/Packages.ycp new/yast2-packager-2.13.80/src/modules/Packages.ycp
--- old/yast2-packager-2.13.78/src/modules/Packages.ycp 2006-04-11 18:44:44.000000000 +0200
+++ new/yast2-packager-2.13.80/src/modules/Packages.ycp 2006-04-12 08:52:31.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 30001 2006-04-11 16:43:22Z jsrain $
+ * $Id: Packages.ycp 30004 2006-04-11 17:08:19Z jsrain $
*/
{
@@ -1108,8 +1108,8 @@
if (using_patterns)
{
- if (! simple)
- {
+// if (! simple)
+// {
list