Hello community,
here is the log from the commit of package yast2-packager
checked in at Sun Apr 20 15:48:51 CEST 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-04-15 12:34:19.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2008-04-18 15:39:37.000000000 +0200
@@ -1,0 +2,23 @@
+Fri Apr 18 15:37:30 CEST 2008 - locilka@suse.cz
+
+- Do not overwrite passwd and shadow files if they already exist on
+ a system (e.g., from images) (bnc #381227).
+- 2.16.36
+
+-------------------------------------------------------------------
+Fri Apr 18 14:24:07 CEST 2008 - lslezak@suse.cz
+
+- Use Pkg::PkgMediaSizes() and Pkg::PkgMediaPackageSizes() for
+ computing total install and download size instead of quering
+ each selected package separately (speeds up the proposal summary
+ from 15-20 seconds to less than 1 second)
+- this is also a workaround for broken disk usage in libzypp
+ (bnc#375104)
+- 2.16.35
+
+-------------------------------------------------------------------
+Wed Apr 16 13:37:41 CEST 2008 - locilka@suse.cz
+
+- Using pattern-xfce for XFCE Desktop selection (bnc #377584).
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.16.34.tar.bz2
New:
----
yast2-packager-2.16.36.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.nD1999/_old 2008-04-20 15:46:52.000000000 +0200
+++ /var/tmp/diff_new_pack.nD1999/_new 2008-04-20 15:46:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.16.34)
+# spec file for package yast2-packager (Version 2.16.36)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,25 +12,25 @@
Name: yast2-packager
-Version: 2.16.34
+Version: 2.16.36
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.16.34.tar.bz2
+Source0: yast2-packager-2.16.36.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
# empty package callbacks
BuildRequires: yast2 >= 2.16.52
-# new registration of callbacks
-BuildRequires: yast2-pkg-bindings >= 2.16.23
+# Pkg::PkgMediaPackageSizes()
+BuildRequires: yast2-pkg-bindings >= 2.16.29
# Module: OneClickInstallStandard
Requires: perl-XML-Bare yast2-perl-bindings
# Newly added RPM
Requires: yast2-country-data >= 2.16.3
Requires: yast2-installation >= 2.15.12
-# new registration of callbacks
-Requires: yast2-pkg-bindings >= 2.16.23
+# Pkg::PkgMediaPackageSizes()
+Requires: yast2-pkg-bindings >= 2.16.29
# empty package callbacks
Requires: yast2 >= 2.16.52
# unzipping license file
@@ -72,7 +72,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.16.34
+%setup -n yast2-packager-2.16.36
%build
%{prefix}/bin/y2tool y2autoconf
@@ -108,6 +108,20 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Fri Apr 18 2008 locilka@suse.cz
+- Do not overwrite passwd and shadow files if they already exist on
+ a system (e.g., from images) (bnc #381227).
+- 2.16.36
+* Fri Apr 18 2008 lslezak@suse.cz
+- Use Pkg::PkgMediaSizes() and Pkg::PkgMediaPackageSizes() for
+ computing total install and download size instead of quering
+ each selected package separately (speeds up the proposal summary
+ from 15-20 seconds to less than 1 second)
+- this is also a workaround for broken disk usage in libzypp
+ (bnc#375104)
+- 2.16.35
+* Wed Apr 16 2008 locilka@suse.cz
+- Using pattern-xfce for XFCE Desktop selection (bnc #377584).
* Tue Apr 15 2008 lslezak@suse.cz
- disable the callbacks when downloading slideshow (bnc#377919)
- 2.16.34
++++++ yast2-packager-2.16.34.tar.bz2 -> yast2-packager-2.16.36.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.34/configure new/yast2-packager-2.16.36/configure
--- old/yast2-packager-2.16.34/configure 2008-04-15 12:33:42.000000000 +0200
+++ new/yast2-packager-2.16.36/configure 2008-01-18 13:29:47.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.34.
+# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.15.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.16.34'
-PACKAGE_STRING='yast2-packager 2.16.34'
+PACKAGE_VERSION='2.16.15'
+PACKAGE_STRING='yast2-packager 2.16.15'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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.16.34 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.16.15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.16.34:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.16.15:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.16.34
+yast2-packager configure 2.16.15
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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.16.34, which was
+It was created by yast2-packager $as_me 2.16.15, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.16.34'
+ VERSION='2.16.15'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.34"
+VERSION="2.16.15"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -2651,8 +2651,8 @@
if test -z "$XGETTEXT" ; then
- { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-tools." >&5
-echo "$as_me: error: xgettext is missing; please install gettext-tools." >&2;}
+ { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-devel." >&5
+echo "$as_me: error: xgettext is missing; please install gettext-devel." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.16.34, which was
+This file was extended by yast2-packager $as_me 2.16.15, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.16.34
+yast2-packager config.status 2.16.15
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.34/configure.in new/yast2-packager-2.16.36/configure.in
--- old/yast2-packager-2.16.34/configure.in 2008-04-15 12:33:38.000000000 +0200
+++ new/yast2-packager-2.16.36/configure.in 2008-01-18 13:29:35.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.16.34, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.16.15, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.34"
+VERSION="2.16.15"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -108,7 +108,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.34/Makefile.in new/yast2-packager-2.16.36/Makefile.in
--- old/yast2-packager-2.16.34/Makefile.in 2008-04-15 12:33:44.000000000 +0200
+++ new/yast2-packager-2.16.36/Makefile.in 2008-01-18 13:29:49.000000000 +0100
@@ -505,6 +505,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -531,6 +535,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -687,10 +693,10 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
+ dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-data install-data-am \
install-data-local install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.34/packager.pot new/yast2-packager-2.16.36/packager.pot
--- old/yast2-packager-2.16.34/packager.pot 2007-12-10 14:45:09.000000000 +0100
+++ new/yast2-packager-2.16.36/packager.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,218 +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: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-10 13:33+0200\n"
-"PO-Revision-Date: 2007-08-22 10:20+0200\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. explanation text for KDE
-#: src/clients/inst_desktop.ycp:62
-msgid ""
-"KDE is a powerful and intuitive desktop\n"
-"environment that uses Kontact as its mailer,\n"
-"Konqueror as its file manager, and offers\n"
-"both Firefox and Konqueror as its Web browser."
-msgstr ""
-"KDE is a powerful and intuitive desktop\n"
-"environment that uses Kontact as its mailer,\n"
-"Konqueror as its file manager, and offers\n"
-"both, Firefox and Konqueror as its Web browser."
-
-#. TRANSLATORS: popup header
-#: src/clients/inst_productsources.ycp:124
-msgid "Network is not Configured"
-msgstr "Network is not configured"
-
-#. TRANSLATORS: dialog help
-#: src/clients/inst_productsources.ycp:426
-msgid ""
-"<p>Please wait, while packager is being initialized\n"
-"and list of servers dowloaded from web.</p>"
-msgstr ""
-"<p>Please wait, while packager is being initialized\n"
-"and a list of servers dowloaded from web.</p>"
-
-#. TRANSLATORS: dialog help 1/3
-#: src/clients/inst_productsources.ycp:877
-msgid ""
-"<p>Here you can see default online repositories downloaded from Internet.\n"
-"Click on the repository to see its details.</p>"
-msgstr ""
-"<p>Here you can see default online repositories downloaded from the Internet.\n"
-"Click on the repository to see its details.</p>"
-
-#. help, continued
-#: src/clients/inst_source.ycp:545
-msgid ""
-"<p>\n"
-"The CDs can be copied to the <b>hard disk</b>\n"
-"Then use that as the repository.\n"
-"Insert the path name where the first\n"
-"CD is located, for example, /data1/<b>CD1</b>.\n"
-"Only the base path is required if all CDs are copied\n"
-"into one directory.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"The CDs can be copied to the <b>hard disk</b>\n"
-"Then use it as the repository.\n"
-"Insert the path name where the first\n"
-"CD is located, for example, /data1/<b>CD1</b>.\n"
-"Only the base path is required if all CDs are copied\n"
-"into one directory.\n"
-"</p>\n"
-
-#. help, continued
-#: src/clients/inst_source.ycp:567
-msgid ""
-"<p>\n"
-"<b>Synchronize Changes with ZENworks</b> will call <tt>rug</tt>\n"
-"to perform the changes also in that package management system.</p>"
-msgstr ""
-"<p>\n"
-"<b>Synchronize changes with ZENworks</b> will call <tt>rug</tt>\n"
-"to perform the changes also in that package management system.</p>"
-
-#. popup message part 1
-#: src/clients/inst_source.ycp:621
-msgid ""
-"Unable to save changes to repository\n"
-"configuration."
-msgstr ""
-"Unable to save changes to the repository\n"
-"configuration."
-
-#. Command line help text for the repository module, %1 is "zypper"
-#: src/clients/inst_source.ycp:974
-msgid "Installation Repositories - this module doesn't support command line interface, use '%1' instead."
-msgstr "Installation Repositories - this module does not support the command line interface, use '%1' instead."
-
-#: src/clients/sw_single.ycp:190
-msgid "There was an error in repository initialization."
-msgstr "There was an error in the repository initialization."
-
-#. Command line help text for the software management module, %1 is "zypper"
-#: src/clients/sw_single.ycp:473
-msgid "Software installation - this module doesn't support command line interface, use '%1' instead."
-msgstr "Software installation - this module does not support the command line interface, use '%1' instead."
-
-#: src/modules/Packages.ycp:864
-msgid "Failed to integrate service pack repository."
-msgstr "Failed to integrate the service pack repository."
-
-#. help text
-#: src/modules/SourceDialogs.ycp:252
-msgid ""
-"<p><big><b>Repository Name</b></big><br>\n"
-"Use <b>Repository Name</b> to specify the name of the repository. If it is empty Yast will use the product name (if available) or the URL as the name.</p>"
-msgstr ""
-"<p><big><b>Repository Name</b></big><br>\n"
-"Use <b>Repository Name</b> to specify the name of the repository. If it is empty YaST will use the product name (if available) or the URL as the name.</p>"
-
-#. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.ycp:587
-msgid ""
-"The entered path is not a directory\n"
-"or the directory doesn't exist."
-msgstr ""
-"The entered path is not a directory\n"
-"or the directory does not exist."
-
-#. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.ycp:614
-msgid ""
-"The entered path is not a file\n"
-"or the file doesn't exist."
-msgstr ""
-"The entered path is not a file\n"
-"or the file does not exist."
-
-#. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.ycp:637
-msgid ""
-"File '%1'\n"
-"doesn't seem to be an ISO image.\n"
-"Use it anyway?"
-msgstr ""
-"File '%1'\n"
-"does not seem to be an ISO image.\n"
-"Use it anyway?"
-
-#. help text - server dialog
-#: src/modules/SourceDialogs.ycp:1039
-msgid ""
-"<p><big><b>Server and Directory</b></big><br>\n"
-"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
-"to specify the NFS server host name and path on the server.\n"
-"To enable authentication, uncheck <b>Anonymous</b> and specify the\n"
-"<b>User Name</b> and the <b>Password</b>.</p>\n"
-"<p>\n"
-"For SMB/CIFS repository, specify <b>Share</b> name and <b>Path to Directory\n"
-"or ISO Image</b>. \n"
-"If the location is a file holding an ISO image\n"
-"of the media, set <b>ISO Image</b>.</p>"
-msgstr ""
-"<p><big><b>Server and Directory</b></big><br>\n"
-"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
-"to specify the NFS server host name and path on the server.\n"
-"To enable authentication, uncheck <b>Anonymous</b> and specify the\n"
-"<b>User Name</b> and the <b>Password</b>.</p>\n"
-"<p>\n"
-"For the SMB/CIFS repository, specify <b>Share</b> name and <b>Path to Directory\n"
-"or ISO Image</b>. \n"
-"If the location is a file holding an ISO image\n"
-"of the media, set <b>ISO Image</b>.</p>"
-
-#. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.ycp:1050
-msgid ""
-"<p>It's possible to set the <b>Port</b> number for a HTTP/HTTPS repository.\n"
-"Leave it empty to use the default port.</p>"
-msgstr ""
-"<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS repository.\n"
-"Leave it empty to use the default port.</p>"
-
-#: src/modules/SourceDialogs.ycp:1305
-msgid ""
-"<p><b>Download Files</b><br>\n"
-"Each repository has description files which describe content of the repository.\n"
-"Check option <b>Download repository description files</b> to download the files\n"
-"when closing this Yast module. If the option is unchecked Yast will\n"
-"automatically download the files when it needs them later. </p>"
-msgstr ""
-"<p><b>Download Files</b><br>\n"
-"Each repository has description files which describe the content of the repository.\n"
-"Check the<b>Download repository description files</b> option to download the files\n"
-"when closing this YaST module. If the option is unchecked YaST will\n"
-"automatically download the files when it needs them later. </p>"
-
-#. popup message header
-#: src/modules/SourceManager.ycp:240
-msgid ""
-"Unable to save changes to the repository\n"
-" repository.\n"
-msgstr "Unable to save changes to the repository.\n"
-
-#. message popup
-#: src/modules/SourceManagerSLP.ycp:314
-msgid ""
-"Please, select one of offered options.\n"
-"This product has more repositories available."
-msgstr ""
-"Please select one of offered options.\n"
-"This product has more repositories available."
-
-#. error popup
-#: src/modules/SourceManagerSLP.ycp:508
-msgid "No SLP repositories have been found on your network."
-msgstr "No SLP repositories have been found on your network."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.34/src/clients/inst_kickoff.ycp new/yast2-packager-2.16.36/src/clients/inst_kickoff.ycp
--- old/yast2-packager-2.16.34/src/clients/inst_kickoff.ycp 2008-03-14 14:33:36.000000000 +0100
+++ new/yast2-packager-2.16.36/src/clients/inst_kickoff.ycp 2008-04-18 15:39:55.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Do various tasks before starting with installation of rpms.
*
- * $Id: inst_kickoff.ycp 45459 2008-03-14 13:12:44Z juhliarik $
+ * $Id: inst_kickoff.ycp 46850 2008-04-18 13:37:46Z locilka $
*
*/
@@ -327,30 +327,46 @@
}
}
-
+ // installation, for instance...
if (!Mode::update ())
{
// make some directories
SCR::Execute(.target.mkdir, Installation::destdir + "/etc");
SCR::Execute(.target.mkdir, Installation::destdir + Directory::logdir);
- // hack 'pre-req' cyclic dependency between bash, aaa_base, and perl
- if (Installation::dirinstall_installing_into_dir)
- {
+ if (Installation::dirinstall_installing_into_dir) {
string template_dir= "/var/adm/fillup-templates";
- // hack 'pre-req' cyclic dependency between bash, aaa_base, and perl
- SCR::Execute(.target.bash, "/bin/cp " + template_dir + "/passwd.aaa_base " +
- "'" + String::Quote (Installation::destdir) + "/etc/passwd" + "'");
- SCR::Execute(.target.bash, "/bin/cp " + template_dir + "/group.aaa_base " +
- "'" + String::Quote (Installation::destdir) + "/etc/group" + "'");
- SCR::Execute(.target.bash, "/bin/cp " + template_dir + "/shadow.aaa_base " +
- "'" + String::Quote (Installation::destdir) + "/etc/shadow" + "'");
- } else
- {
- SCR::Execute(.target.bash, "/bin/cp /etc/passwd " +
- "'" + String::Quote (Installation::destdir) + "/etc" + "'");
- SCR::Execute(.target.bash, "/bin/cp /etc/group " +
- "'" + String::Quote (Installation::destdir) + "/etc" + "'");
+
+ // hack 'pre-req' cyclic dependency between bash, aaa_base, and perl
+ foreach (string filename, ["passwd", "group", "shadow"], {
+ string filename_copy_to = sformat ("%1/etc/%2", Installation::destdir, filename);
+
+ if (FileUtils::Exists (filename_copy_to)) {
+ y2milestone ("File %1 exists, not rewriting", filename_copy_to);
+ } else {
+ filename = sformat ("%1/%2.aaa_base", template_dir, filename);
+ y2milestone ("Copying %1 to %2", filename, filename_copy_to);
+ SCR::Execute (.target.bash,
+ sformat ("cp -a '%1' '%2'", String::Quote (filename), String::Quote (filename_copy_to))
+ );
+ }
+ });
+
+ } else {
+ // See bnc #381227
+ // files might have been copied alredy from image
+ foreach (string filename, ["/etc/passwd", "/etc/group"], {
+ string filename_copy_to = sformat ("%1/%2", Installation::destdir, filename);
+
+ if (FileUtils::Exists (filename_copy_to)) {
+ y2milestone ("File %1 exists, not rewriting", filename_copy_to);
+ } else {
+ y2milestone ("Copying %1 to %2", filename, filename_copy_to);
+ SCR::Execute (.target.bash,
+ sformat ("cp -a '%1' '%2'", String::Quote (filename), String::Quote (filename_copy_to))
+ );
+ }
+ });
}
// fake mtab
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.34/src/modules/DefaultDesktop.ycp new/yast2-packager-2.16.36/src/modules/DefaultDesktop.ycp
--- old/yast2-packager-2.16.34/src/modules/DefaultDesktop.ycp 2008-04-14 16:43:47.000000000 +0200
+++ new/yast2-packager-2.16.36/src/modules/DefaultDesktop.ycp 2008-04-16 13:37:21.000000000 +0200
@@ -44,7 +44,7 @@
// TRANSLATORS: Dialog label
"label" : _("XFCE Desktop"),
"patterns" : ["xfce", "x11", "base"],
- "icon" : "yast-tv",
+ "icon" : "pattern-xfce",
],
"min_x" : $[
"order" : 6,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.34/src/modules/Packages.ycp new/yast2-packager-2.16.36/src/modules/Packages.ycp
--- old/yast2-packager-2.16.34/src/modules/Packages.ycp 2008-04-15 11:36:20.000000000 +0200
+++ new/yast2-packager-2.16.36/src/modules/Packages.ycp 2008-04-18 14:55:33.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 46651 2008-04-15 09:36:20Z lslezak $
+ * $Id: Packages.ycp 46836 2008-04-18 12:45:14Z lslezak $
*/
{
@@ -150,35 +150,48 @@
*/
global string CountSizeToBeInstalled () {
integer sz = 0;
- if (! Mode::installation () && !Installation::dirinstall_installing_into_dir )
- {
- list<string> packages = Pkg::GetPackages (`selected, true);
- foreach (string p, packages, {
- sz = sz + Pkg::PkgSize (p);
- });
- // convert into kB
- sz = sz / 1024;
- }
- else // in case of fresh installation, disk is initially empty
- {
- map du = Pkg::TargetGetDU ();
- foreach (string mp, list usages, du, {
- sz = sz + usages[2]:0 - usages[1]:0;
- });
- }
- y2milestone ("Total size of packages to install (kB): %1", sz);
- return String::FormatSizeWithPrecision (sz*1024, 1, true);
+ list media_sizes = Pkg::PkgMediaSizes();
+
+ foreach (list<integer> inst_sizes, media_sizes,
+ {
+ foreach (integer inst_size, inst_sizes,
+ {
+ sz = sz + inst_size;
+ }
+ );
+ }
+ );
+
+ y2milestone ("Total size of packages to install %1 (%2kB)", sz, sz / 1024 );
+ return String::FormatSizeWithPrecision (sz, 1, true);
+}
+
+map SrcMapping()
+{
+ map srcid_to_current_src_no = $[];
+ integer index = 0;
+
+ list< list > src_list = Pkg::PkgMediaNames();
+ y2debug("source names: %1", src_list);
+
+ srcid_to_current_src_no = listmap( list src, src_list, {
+ index = index + 1;
+ return $[src[1]:-1 : index];
+ });
+
+ y2milestone ("Repository mapping information: %1", srcid_to_current_src_no );
+ return srcid_to_current_src_no;
}
/**
* Count the total size of packages to be installed
- * @return string formatted size of packages to be installed
+ * @return integer size of packages to be installed (in bytes)
*/
global integer CountSizeToBeDownloaded() {
integer ret = 0;
// get list of remote repositories
- // consider only http and ftp protocols as remote
+ // consider only http(s) and ftp protocols as remote
// all enabled sources
list<integer> repos = Pkg::SourceGetCurrent(true);
@@ -187,9 +200,9 @@
foreach(integer repo, repos,
{
string url = Pkg::SourceGeneralData(repo)["url"]:"";
- string scheme = URL::Parse(url)["scheme"]:"";
+ string scheme = tolower(URL::Parse(url)["scheme"]:"");
- if (tolower(scheme) == "http" || tolower(scheme) == "ftp")
+ if (scheme == "http" || scheme == "https" || scheme == "ftp")
{
y2milestone("Found remote repository %1: %2", repo, url);
remote_repos = add(remote_repos, repo);
@@ -204,28 +217,24 @@
return 0;
}
- list<string> packages = Pkg::GetPackages (`selected, true);
+ map repo_mapping = SrcMapping();
+
+ list media_sizes = Pkg::PkgMediaPackageSizes();
+ y2debug("Media sizes: %1", media_sizes);
- foreach (string p, packages,
+ foreach(integer repoid, remote_repos,
{
- list<map> properties = Pkg::ResolvableProperties(p, `package, "");
+ list<integer> repo_media_sizes = media_sizes[(repo_mapping[repoid]:-1) - 1]:[];
- foreach(map prop, properties,
+ foreach(integer media_size, repo_media_sizes,
{
- // the package is selected for installation
- if (prop["status"]:`unknown == `selected && contains(remote_repos, prop["source"]:-1))
- {
- y2debug("Found remote package %1-%2 (%3) from repository %4", p, prop["version"]:"", prop["download_size"]:0, prop["source"]:-1);
-
- ret = ret + prop["download_size"]:0;
- }
+ ret = ret + media_size;
}
);
}
);
- y2milestone("Total size of packages to download: %1 (%2 B)", String::FormatSizeWithPrecision(ret, 1, true), ret);
-
+ y2milestone("Total size of packages to download: %1 (%2kB)", ret, ret / 1024);
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.34/VERSION new/yast2-packager-2.16.36/VERSION
--- old/yast2-packager-2.16.34/VERSION 2008-04-15 11:25:36.000000000 +0200
+++ new/yast2-packager-2.16.36/VERSION 2008-04-18 15:39:45.000000000 +0200
@@ -1 +1 @@
-2.16.34
+2.16.36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org