Hello community,
here is the log from the commit of package yast2-packager
checked in at Thu Apr 27 14:45:22 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-04-27 08:37:57.000000000 +0200
+++ STABLE/yast2-packager/yast2-packager.changes 2006-04-27 10:53:17.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Apr 27 10:51:14 CEST 2006 - locilka@suse.cz
+
+- Do not create the /etc/mdadm.conf file when it is not needed
+ or when the file already exists (during inst-update) (#169710)
+- 2.13.102
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.101.tar.bz2
New:
----
yast2-packager-2.13.102.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.aGgkUS/_old 2006-04-27 14:45:16.000000000 +0200
+++ /var/tmp/diff_new_pack.aGgkUS/_new 2006-04-27 14:45:16.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.101)
+# spec file for package yast2-packager (Version 2.13.102)
#
# 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.101
-Release: 1
+Version: 2.13.102
+Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.101.tar.bz2
+Source0: yast2-packager-2.13.102.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.101
+%setup -n yast2-packager-2.13.102
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,10 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Thu Apr 27 2006 - locilka@suse.cz
+- Do not create the /etc/mdadm.conf file when it is not needed
+ or when the file already exists (during inst-update) (#169710)
+- 2.13.102
* Thu Apr 27 2006 - lslezak@suse.cz
- dirinstall - create /dev/null and /dev/zero devices in
the target directory (some packages require them in the
++++++ yast2-packager-2.13.101.tar.bz2 -> yast2-packager-2.13.102.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.101/Makefile.am new/yast2-packager-2.13.102/Makefile.am
--- old/yast2-packager-2.13.101/Makefile.am 2006-04-27 08:40:59.000000000 +0200
+++ new/yast2-packager-2.13.102/Makefile.am 2006-04-27 10:54:35.000000000 +0200
@@ -8,6 +8,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -95,7 +96,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +117,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +144,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -200,12 +201,12 @@
fi
check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+ $(Y2TOOL) check-textdomain $(srcdir)
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.101/Makefile.in new/yast2-packager-2.13.102/Makefile.in
--- old/yast2-packager-2.13.101/Makefile.in 2006-04-27 08:41:06.000000000 +0200
+++ new/yast2-packager-2.13.102/Makefile.in 2006-04-27 10:54:42.000000000 +0200
@@ -198,6 +198,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS)
ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
@@ -227,7 +228,7 @@
$(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1)
@CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc
@CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
# test ! -d $(srcdir)/po \
# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
@@ -724,7 +725,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -745,7 +746,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -772,15 +773,15 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
@@ -827,12 +828,12 @@
fi
check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+ $(Y2TOOL) check-textdomain $(srcdir)
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
checkpo:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.101/VERSION new/yast2-packager-2.13.102/VERSION
--- old/yast2-packager-2.13.101/VERSION 2006-04-27 08:39:45.000000000 +0200
+++ new/yast2-packager-2.13.102/VERSION 2006-04-27 10:51:09.000000000 +0200
@@ -1 +1 @@
-2.13.101
+2.13.102
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.101/configure new/yast2-packager-2.13.102/configure
--- old/yast2-packager-2.13.101/configure 2006-04-27 08:41:03.000000000 +0200
+++ new/yast2-packager-2.13.102/configure 2006-04-27 10:54: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-packager 2.13.101.
+# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.102.
#
# 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.101'
-PACKAGE_STRING='yast2-packager 2.13.101'
+PACKAGE_VERSION='2.13.102'
+PACKAGE_STRING='yast2-packager 2.13.102'
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.101 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.13.102 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.101:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.13.102:";;
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.101
+yast2-packager configure 2.13.102
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.101, which was
+It was created by yast2-packager $as_me 2.13.102, 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.101'
+ VERSION='2.13.102'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.101"
+VERSION="2.13.102"
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.101, which was
+This file was extended by yast2-packager $as_me 2.13.102, 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.101
+yast2-packager config.status 2.13.102
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.101/configure.in new/yast2-packager-2.13.102/configure.in
--- old/yast2-packager-2.13.101/configure.in 2006-04-27 08:40:58.000000000 +0200
+++ new/yast2-packager-2.13.102/configure.in 2006-04-27 10:54:35.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.101, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.102, 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.101"
+VERSION="2.13.102"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.101/packager.pot new/yast2-packager-2.13.102/packager.pot
--- old/yast2-packager-2.13.101/packager.pot 2006-03-10 16:31:46.000000000 +0100
+++ new/yast2-packager-2.13.102/packager.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,301 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: yast2 9.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-06 14:35+0100\n"
-"PO-Revision-Date: 2006-03-07 12:52+0100\n"
-"Last-Translator: proofreader\n"
-"Language-Team: en_US\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. label for showing installation sources
-#: src/clients/inst_media.ycp:40 src/clients/inst_mediacopy.ycp:46
-msgid "Registered Catalogs:"
-msgstr "Registered Catalogs"
-
-#: src/clients/inst_packages.ycp:69 src/clients/inst_packages.ycp:74
-#: src/clients/inst_packages.ycp:79 src/clients/inst_packages.ycp:83
-msgid "<p>"
-msgstr ""
-
-#. Dialog title
-#. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
-#: src/clients/inst_packages.ycp:95
-msgid "Software Selection and System Tasks"
-msgstr ""
-
-#. error report
-#: src/clients/inst_rpmcopy.ycp:163
-msgid "Error occurred while switching the service pack catalog."
-msgstr ""
-
-#. 3. Copy /<arch>/<package> from cached source to Installation::destdir+"/{var?}/tmp"
-#. translators: this is an information popup, %1 is a number
-#: src/clients/inst_rpmcopy.ycp:418
-#, ycp-format
-msgid "Copying files from CD %1 to disk..."
-msgstr ""
-
-#. Intermediate contents of the software selection screen
-#: src/clients/inst_selections.ycp:45
-msgid "Initializing catalogs..."
-msgstr ""
-
-#. Help text Software Selection dialog
-#. Explain selectable system configurations but beware:
-#. some of the text in <b>'s, e.g. Default comes from the index file,
-#. translations must be consistent with po/index/index.??.po
-#: src/clients/inst_selections.ycp:83
-msgid ""
-"<p>\n"
-"The &product; Standard System is a good software\n"
-"selection for most users.\n"
-"</p>"
-msgstr ""
-
-#. help text, continued
-#: src/clients/inst_selections.ycp:95
-msgid ""
-"<p>\n"
-"The <b>Minimal</b> system includes just the bare essentials needed\n"
-"to safely run &product;. This selection <b><i>does not include\n"
-"graphical desktop environments</i></b> -- no X11, no KDE, no GNOME.\n"
-"Select this option as a base for your own custom selection, for\n"
-"dedicated server systems that do not need a graphical desktop, or for\n"
-"systems that are short on disk space or memory.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"The <b>Minimal</b> system includes just the bare essentials needed\n"
-"to safely run &product;. This selection does not include\n"
-"graphical desktop environments--no X11, no KDE, no GNOME.\n"
-"Select this option as a base for your own custom selection, for\n"
-"dedicated server systems that do not need a graphical desktop, or for\n"
-"systems that are short on disk space or memory.\n"
-"</p>"
-
-#. help text, continued
-#: src/clients/inst_selections.ycp:105
-msgid ""
-"<p>\n"
-"With the <b>Minimum graphical system</b>, install the &product;\n"
-"base system and all packages required for X11, the graphical user\n"
-"interface (GUI).\n"
-"You can then work with a simple graphical desktop. </p>"
-msgstr ""
-
-#. label
-#: src/clients/inst_source.ycp:99 src/modules/SourceManager.ycp:459
-msgid "Adding catalog..."
-msgstr ""
-
-#. message part 2 alt. 1
-#: src/clients/inst_source.ycp:115 src/modules/SourceManager.ycp:478
-msgid "A catalog for this product already exists."
-msgstr ""
-
-#. dialog caption
-#: src/clients/inst_source.ycp:264
-msgid "Media Containing the Software Catalog"
-msgstr ""
-
-#: src/clients/inst_source.ycp:312
-msgid ""
-"There were errors when restoring the sources configuration.\n"
-"Not all sources will be available for configuration."
-msgstr ""
-"There were errors when restoring the source configuration.\n"
-"Not all sources will be available for configuration."
-
-#: src/clients/inst_source.ycp:354
-msgid "No SLP catalogs found."
-msgstr ""
-
-#. translators: popup heading
-#: src/clients/inst_source.ycp:373
-msgid "Choose SLP Catalog"
-msgstr ""
-
-#. popup headline
-#: src/clients/inst_source.ycp:486
-msgid "Abort Catalog Configuration"
-msgstr ""
-
-#. popup message
-#: src/clients/inst_source.ycp:488
-msgid ""
-"Abort the catalog configuration?\n"
-"All changes will be lost."
-msgstr ""
-
-#. yes-no popup
-#: src/clients/inst_source.ycp:545
-msgid "Delete selected catalog from list?"
-msgstr "Delete the selected catalog from the list?"
-
-#. label
-#: src/include/inst_source_dialogs.ycp:157
-msgid "NFS Server Source"
-msgstr ""
-
-#. text entry
-#: src/include/inst_source_dialogs.ycp:161
-#: src/include/inst_source_dialogs.ycp:326
-#: src/include/inst_source_dialogs.ycp:498
-msgid "&Path to Directory or ISO Image"
-msgstr ""
-
-#. checkbox label
-#: src/include/inst_source_dialogs.ycp:163
-#: src/include/inst_source_dialogs.ycp:328
-#: src/include/inst_source_dialogs.ycp:506
-msgid "ISO Image"
-msgstr ""
-
-#. label
-#: src/include/inst_source_dialogs.ycp:495
-msgid "Local Directory or ISO"
-msgstr ""
-
-#. dialog caption
-#: src/include/inst_source_dialogs.ycp:528
-msgid "ISO Image File"
-msgstr ""
-
-#. label
-#: src/include/inst_source_dialogs.ycp:659
-msgid "Catalog URL"
-msgstr ""
-
-#. error popup during package installation, %1 is the name of the package
-#: src/modules/PackageCallbacks.ycp:365
-#, ycp-format
-msgid "Removal of package %1 failed."
-msgstr ""
-
-#. error report
-#: src/modules/PackageCallbacks.ycp:496
-msgid ""
-"<p>The source at the specified URL now provides a different media ID.\n"
-"If the URL is correct, this indicates that the source content has changed. To \n"
-"continue using this source, start <b>Change Source of Installation</b> from \n"
-"the YaST control center and refresh the installation source.</p>\n"
-msgstr ""
-
-#. currently unused
-#: src/modules/PackageCallbacks.ycp:553
-msgid "The correct catalog medium could not be mounted."
-msgstr ""
-
-#. error message - a label followed by a richtext with details
-#: src/modules/PackageCallbacks.ycp:733
-msgid "Error occurred while refreshing the catalog."
-msgstr ""
-
-#. error message - a label followed by a richtext with details
-#: src/modules/PackageCallbacks.ycp:736
-msgid "Unable to retrieve the remote catalog description."
-msgstr ""
-
-#. command line mode - ask user whether the installation should be aborted
-#: src/modules/PackageCallbacks.ycp:763
-msgid "Disable the catalog?"
-msgstr ""
-
-#. push button
-#: src/modules/PackageCallbacks.ycp:786
-msgid "&Disable Catalog"
-msgstr ""
-
-#. message popup
-#: src/modules/PackageCallbacks.ycp:814
-msgid "Catalog not refreshed."
-msgstr ""
-
-#. message popup
-#: src/modules/PackageCallbacks.ycp:820
-msgid "Catalog disabled."
-msgstr ""
-
-#. error in proposal, %1 is URL
-#: src/modules/Packages.ycp:522
-#, ycp-format
-msgid "No catalog found at '%1'."
-msgstr ""
-
-#. message popup, %1 is product name
-#: src/modules/Packages.ycp:530
-#, ycp-format
-msgid "Insert %1 CD 1"
-msgstr ""
-
-#. SourceManager read dialog caption
-#: src/modules/SourceManager.ycp:130
-msgid "Initializing Available Catalogs"
-msgstr ""
-
-#. Progress stage 1/3
-#: src/modules/SourceManager.ycp:138
-msgid "Read configured catalogs"
-msgstr ""
-
-#. Progress stage 2/3
-#: src/modules/SourceManager.ycp:140
-msgid "Detect available catalogs via SLP"
-msgstr ""
-
-#. Progress step 1/3
-#: src/modules/SourceManager.ycp:143
-msgid "Reading configured catalogs..."
-msgstr ""
-
-#. Progress step 2/3
-#: src/modules/SourceManager.ycp:145
-msgid "Detecting available catalogs..."
-msgstr ""
-
-#. Error message
-#: src/modules/SourceManager.ycp:158
-msgid "Cannot read catalogs."
-msgstr ""
-
-#. Error message
-#: src/modules/SourceManager.ycp:166
-msgid "Cannot detect availabe catalogs."
-msgstr ""
-
-#. popup message header
-#: src/modules/SourceManager.ycp:192
-msgid ""
-"Unable to save changes to the catalog\n"
-" repository.\n"
-msgstr ""
-
-#. SourceManager read dialog caption
-#: src/modules/SourceManager.ycp:222
-msgid "Saving Catalog Configuration"
-msgstr ""
-
-#. Progress stage 1/1
-#: src/modules/SourceManager.ycp:229
-msgid "Write catalog settings"
-msgstr ""
-
-#: src/modules/SourceManager.ycp:472
-#, ycp-format
-msgid ""
-"Unable to create catalog\n"
-"from URL '%1'."
-msgstr ""
-
-#. summary header
-#: src/modules/SourceManager.ycp:643
-msgid "Configured Catalogs"
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.101/src/clients/inst_kickoff.ycp new/yast2-packager-2.13.102/src/clients/inst_kickoff.ycp
--- old/yast2-packager-2.13.101/src/clients/inst_kickoff.ycp 2006-03-20 08:48:43.000000000 +0100
+++ new/yast2-packager-2.13.102/src/clients/inst_kickoff.ycp 2006-04-27 10:50:51.000000000 +0200
@@ -23,6 +23,7 @@
import "Initrd";
import "Kernel";
import "Arch";
+ import "FileUtils";
void AcpiToInitrd () {
if (! (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ()))
@@ -241,21 +242,38 @@
}
/**
- * Create /etc/mdadm.conf if it does not exist
+ * Create /etc/mdadm.conf if it does not exist and it's needed
+ * bugs: #169710 and #146304
*/
void createmdadm () {
- if ((integer)SCR::Read (.target.size, Installation::destdir + "/etc/mdadm.conf") < 0)
- {
- y2milestone ("/etc/mdadm.conf doesn't exist, creating it");
- map out = (map)SCR::Execute (.target.bash_output, "echo DEV partitions > " + Installation::destdir + "/etc/mdadm.conf");
- if (out["exit"]:-1 != 0)
- y2error ("Error occurred while creating /etc/mdadm.conf: %1", out);
- out = (map)SCR::Execute (.target.bash_output, "chroot " + Installation::destdir + " mdadm -Ds >> /etc/mdadm.conf");
- if (out["exit"]:-1 != 0)
- y2error ("Error occurred while creating /etc/mdadm.conf: %1", out);
+ string mdamd_configfile = Installation::destdir + "/etc/mdadm.conf";
+ // File exists, no need to create it
+ if (FileUtils::Exists(mdamd_configfile)) {
+ y2milestone("File /etc/mdadm.conf exists, skipping creation...");
+ return;
}
- }
+ // get the current raid configuration
+ map out = (map) SCR::Execute (.target.bash_output, "chroot " + Installation::destdir + " mdadm -Ds");
+ if (out["exit"]:-1 != 0) {
+ y2error ("Error occurred while getting raid configuration: %1", out);
+ return;
+ }
+ // There's no current raid configuration, no reason to create that file, bug #169710
+ if (out["stdout"]:"" == "") {
+ y2milestone("No raid is currently configured, skipping file creation...");
+ return;
+ }
+
+ // File format defined in bug #146304
+ string mdadm_content = "DEV partitions\n" +
+ out["stdout"]:"" + "\n";
+
+ y2milestone ("/etc/mdadm.conf doesn't exist, creating it");
+ if (! (boolean) SCR::Write (.target.string, mdamd_configfile, mdadm_content)) {
+ y2error ("Error occurred while creating /etc/mdadm.conf with content '%1'", mdadm_content);
+ }
+ }
/**
* Load all network modules. The package sysconfig requires this during
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.101/src/modules/test.ycp new/yast2-packager-2.13.102/src/modules/test.ycp
--- old/yast2-packager-2.13.101/src/modules/test.ycp 2005-11-02 13:29:02.000000000 +0100
+++ new/yast2-packager-2.13.102/src/modules/test.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-
-{
- import "Package";
- import "CommandLine";
-
- textdomain "test";
-
- boolean startHandler(map opts) {
- Package::InstallAll(["samba-doc", "qt3-devel-doc"]);
-// Package::InstallAll(["sambadocdfdfdf"]);
-
- return true;
- }
-
- symbol GUIhandler() {
- y2milestone("GUIhandler");
- return `next;
- }
-
- boolean Read() {
- return true;
- }
-
- boolean Write() {
- return true;
- }
-
- map cmdline = $[
- // help text
- "help" : _("Start installation in a virtual machine"),
- "id" : "vm",
- "guihandler": GUIhandler,
- "initialize": Read,
- "finish" : Write,
- "actions" : $[
- "start" : $[
- // command description
- "help" : _("Start installation"),
- "handler" : startHandler
- ]
- ],
- "options" : $[
- "configured" : $[
- // option description
- "help" : _("List only configured devices")
- ],
- "all" : $[
- // option description
- "help" : _("List all detected IDE devices")
- ]
- ],
- "mappings" : $[
- "start" : ["configured", "all"],
- ]
- ];
-
- any ret = CommandLine::Run(cmdline);
-}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...