Hello community,
here is the log from the commit of package yast2-installation
checked in at Fri Jul 11 14:26:29 CEST 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-06-03 15:12:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2008-07-10 13:31:11.000000000 +0200
@@ -2 +2 @@
-Tue Jun 3 15:11:15 CEST 2008 - locilka@suse.cz
+Thu Jul 10 13:31:00 CEST 2008 - locilka@suse.cz
@@ -3,0 +4,63 @@
+- Only directories in release-notes directory are considered to be
+ real release notes (bnc #407922).
+- 2.17.0
+
+-------------------------------------------------------------------
+Wed Jul 9 17:09:15 CEST 2008 - mvidner@suse.cz
+
+- Fixed building in a prefix (/etc).
+
+-------------------------------------------------------------------
+Wed Jul 9 15:12:53 CEST 2008 - locilka@suse.cz
+
+- Initializing the 'use_automatic_configuration' in first-stage
+ installation worker (bnc #404122).
+- Adjusted dependency on autoyast2-installation bacause of new
+ function AutoinstConfig::getProposalList().
+
+-------------------------------------------------------------------
+Thu Jun 26 16:43:32 CEST 2008 - locilka@suse.cz
+
+- Fixed help text for deploying images (bnc #391086).
+- Fixed 'Do not panic!' text (bnc #388251).
+
+-------------------------------------------------------------------
+Wed Jun 25 16:44:33 CEST 2008 - ug@suse.de
+
+- proposal selection possible via autoyast profile (fate#302946)
+
+-------------------------------------------------------------------
+Tue Jun 17 14:23:04 CEST 2008 - lslezak@suse.cz
+
+- use Pkg::SourceSaveAll() instead of Pkg::SourceFinishAll()
+ (bnc#395738)
+
+-------------------------------------------------------------------
+Fri Jun 13 15:37:24 CEST 2008 - locilka@suse.cz
+
+- Removing Pkg//Source and Target finish from inst_inc_all that
+ had been saving sources also in case of aborting the installation
+ and moving it to inst_congratulate and umount_finish
+ (bnc #398315).
+- Freeing internal variables in ImageInstallation module after
+ images are deployed (bnc #395030).
+
+-------------------------------------------------------------------
+Thu Jun 12 16:33:24 CEST 2008 - locilka@suse.cz
+
+- Special mounts (such as /proc) are never remounted read-only
+ in umount_finish anymore (bnc #395034)
+- Added progress for adding / removing repositories in
+ inst_upgrade_urls client (bnc #399223)
+
+-------------------------------------------------------------------
+Wed Jun 4 11:57:07 CEST 2008 - locilka@suse.cz
+
+- Copying /license.tar.gz to /etc/YaST2/license/ (bnc #396444).
+- Initial mouse probing has been disabled (bnc #395426).
+
+-------------------------------------------------------------------
+Tue Jun 3 13:44:56 CEST 2008 - locilka@suse.cz
+
+- Umounting temporary directory in inst_pre_install (if already
+ mounted) before new mount is called.
@@ -6 +68,0 @@
-- 2.16.50
Old:
----
yast2-installation-2.16.50.tar.bz2
New:
----
yast2-installation-2.17.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.W18933/_old 2008-07-11 14:25:52.000000000 +0200
+++ /var/tmp/diff_new_pack.W18933/_new 2008-07-11 14:25:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.16.50)
+# spec file for package yast2-installation (Version 2.17.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,21 +12,22 @@
Name: yast2-installation
-Version: 2.16.50
+Version: 2.17.0
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.16.50.tar.bz2
+Source0: yast2-installation-2.17.0.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# PackageCallbacks::RegisterEmptyProgressCallbacks()
BuildRequires: yast2 >= 2.16.52
# SourceManager::InstInitSourceMoveDownloadArea
BuildRequires: yast2-packager >= 2.16.32
-Requires: autoyast2-installation
-# PackageCallbacks::RegisterEmptyProgressCallbacks()
-Requires: yast2 >= 2.16.52
+# AutoinstConfig::getProposalList
+Requires: autoyast2-installation >= 2.17.1
+# (public) ProductControl::InitAutomaticConfiguration
+Requires: yast2 >= 2.17.7
# Required in in the first stage, after
# switching to the installed system, bugzilla #249679
Requires: yast2-bootloader
@@ -107,7 +108,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.16.50
+%setup -n yast2-installation-2.17.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -173,10 +174,45 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Thu Jul 10 2008 locilka@suse.cz
+- Only directories in release-notes directory are considered to be
+ real release notes (bnc #407922).
+- 2.17.0
+* Wed Jul 09 2008 mvidner@suse.cz
+- Fixed building in a prefix (/etc).
+* Wed Jul 09 2008 locilka@suse.cz
+- Initializing the 'use_automatic_configuration' in first-stage
+ installation worker (bnc #404122).
+- Adjusted dependency on autoyast2-installation bacause of new
+ function AutoinstConfig::getProposalList().
+* Thu Jun 26 2008 locilka@suse.cz
+- Fixed help text for deploying images (bnc #391086).
+- Fixed 'Do not panic!' text (bnc #388251).
+* Wed Jun 25 2008 ug@suse.de
+- proposal selection possible via autoyast profile (fate#302946)
+* Tue Jun 17 2008 lslezak@suse.cz
+- use Pkg::SourceSaveAll() instead of Pkg::SourceFinishAll()
+ (bnc#395738)
+* Fri Jun 13 2008 locilka@suse.cz
+- Removing Pkg//Source and Target finish from inst_inc_all that
+ had been saving sources also in case of aborting the installation
+ and moving it to inst_congratulate and umount_finish
+ (bnc #398315).
+- Freeing internal variables in ImageInstallation module after
+ images are deployed (bnc #395030).
+* Thu Jun 12 2008 locilka@suse.cz
+- Special mounts (such as /proc) are never remounted read-only
+ in umount_finish anymore (bnc #395034)
+- Added progress for adding / removing repositories in
+ inst_upgrade_urls client (bnc #399223)
+* Wed Jun 04 2008 locilka@suse.cz
+- Copying /license.tar.gz to /etc/YaST2/license/ (bnc #396444).
+- Initial mouse probing has been disabled (bnc #395426).
* Tue Jun 03 2008 locilka@suse.cz
+- Umounting temporary directory in inst_pre_install (if already
+ mounted) before new mount is called.
- Always use --numeric-owner (always use numbers for user/group
names) when deploying images (bnc #396689).
-- 2.16.50
* Mon Jun 02 2008 locilka@suse.cz
- Return `next when going back to the automatic configuration
dialog instead of returning `auto that would finish YaST and
++++++ yast2-installation-2.16.50.tar.bz2 -> yast2-installation-2.17.0.tar.bz2 ++++++
++++ 3738 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.50/configure.in new/yast2-installation-2.17.0/configure.in
--- old/yast2-installation-2.16.50/configure.in 2008-06-02 12:40:51.000000000 +0200
+++ new/yast2-installation-2.17.0/configure.in 2008-07-10 13:31:38.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.16.49, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.17.0, http://bugs.opensuse.org/, yast2-installation)
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.49"
+VERSION="2.17.0"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -170,6 +170,12 @@
AX_CHECK_DOCBOOK
+# If we change the default here instead of in Makefile.am
+# then it can be overriden at configure time
+if test "${sysconfdir}" = '${prefix}/etc'; then
+ sysconfdir=/etc
+fi
+
AC_MSG_CHECKING([fvwm directory])
coresysconfdir=`pkg-config --print-errors --variable=sysconfdir yast2-core`
if test -z "$coresysconfdir"; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.50/configure.in.in new/yast2-installation-2.17.0/configure.in.in
--- old/yast2-installation-2.16.50/configure.in.in 2008-05-30 13:19:38.000000000 +0200
+++ new/yast2-installation-2.17.0/configure.in.in 2008-07-10 13:30:41.000000000 +0200
@@ -23,6 +23,12 @@
AX_CHECK_DOCBOOK
+# If we change the default here instead of in Makefile.am
+# then it can be overriden at configure time
+if test "${sysconfdir}" = '${prefix}/etc'; then
+ sysconfdir=/etc
+fi
+
AC_MSG_CHECKING([fvwm directory])
coresysconfdir=`pkg-config --print-errors --variable=sysconfdir yast2-core`
if test -z "$coresysconfdir"; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.50/src/clients/copy_files_finish.ycp new/yast2-installation-2.17.0/src/clients/copy_files_finish.ycp
--- old/yast2-installation-2.16.50/src/clients/copy_files_finish.ycp 2008-05-30 13:19:37.000000000 +0200
+++ new/yast2-installation-2.17.0/src/clients/copy_files_finish.ycp 2008-06-04 12:03:30.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: copy_files_finish.ycp 42211 2007-11-20 11:39:40Z locilka $
+ * $Id: copy_files_finish.ycp 48052 2008-06-04 10:03:29Z locilka $
*
*/
@@ -177,10 +177,21 @@
SCR::Execute (.target.remove, eula_txt);
}
- // Copy info.txt so it can be used in firstboot (new eula.txt)
- if (FileUtils::Exists ("/info.txt"))
- {
- SCR::Execute (.target.bash, sformat("/bin/cp /info.txt %1", eula_txt));
+ string license_dir = sformat ("%1%2/license/", Installation::destdir, Directory::etcdir);
+ string license_file = "/license.tar.gz";
+ // Copy licenses so it can be used in firstboot later
+ // bnc #396976
+ map cmd = (map) WFM::Execute (.target.bash_output,
+ sformat (
+ "mkdir -p '%1' && cd '%1' && rm -rf license*.txt; tar -xf '%2'",
+ String::Quote (license_dir),
+ String::Quote (license_file)
+ )
+ );
+ if (cmd["exit"]:-1 == 0) {
+ y2milestone ("Copying %1 to %2 was successful", license_file, license_dir);
+ } else {
+ y2error ("Copying %1 to %2 has failed: %3", license_file, license_dir, cmd);
}
// bugzila #328126
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.50/src/clients/inst_automatic_configuration.ycp new/yast2-installation-2.17.0/src/clients/inst_automatic_configuration.ycp
--- old/yast2-installation-2.16.50/src/clients/inst_automatic_configuration.ycp 2008-06-02 12:33:31.000000000 +0200
+++ new/yast2-installation-2.17.0/src/clients/inst_automatic_configuration.ycp 2008-07-09 14:57:48.000000000 +0200
@@ -126,14 +126,14 @@
// the installation has failed.
_("
-***********************************************************
+******************************************************
-Do not panic!
+ Do not panic!
-X11 Configuration must have switched to console for a while
-to do detect your videocard properly...
+ X11 Configuration must switch to console for a while
+ to do detect your videocard properly...
-***********************************************************
+******************************************************
")
);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.50/src/clients/inst_congratulate.ycp new/yast2-installation-2.17.0/src/clients/inst_congratulate.ycp
--- old/yast2-installation-2.16.50/src/clients/inst_congratulate.ycp 2008-05-30 13:19:37.000000000 +0200
+++ new/yast2-installation-2.17.0/src/clients/inst_congratulate.ycp 2008-06-17 15:46:17.000000000 +0200
@@ -6,7 +6,7 @@
*
* Display a congratulation message for the user.
*
- * $Id: inst_congratulate.ycp 45912 2008-04-01 07:17:26Z jsrain $
+ * $Id: inst_congratulate.ycp 48364 2008-06-17 13:13:36Z lslezak $
*/
{
@@ -197,7 +197,7 @@
// #165860
// Save sources now because cloning garbles the target
// Cloning reinitializes sources when it needs them
- Pkg::SourceFinishAll ();
+ Pkg::SourceSaveAll ();
Call::Function("clone_system" , ["doClone"]);
}
@@ -247,5 +247,10 @@
CallCloning();
}
+ // save all sources and finish target
+ // bnc #398315
+ Pkg::SourceSaveAll();
+ Pkg::TargetFinish();
+
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.50/src/clients/inst_deploy_image.ycp new/yast2-installation-2.17.0/src/clients/inst_deploy_image.ycp
--- old/yast2-installation-2.16.50/src/clients/inst_deploy_image.ycp 2008-05-30 13:19:37.000000000 +0200
+++ new/yast2-installation-2.17.0/src/clients/inst_deploy_image.ycp 2008-06-26 16:43:18.000000000 +0200
@@ -12,6 +12,9 @@
// There is nothing to do
if (! Installation::image_installation) {
y2milestone ("No images have been selected");
+ // bnc #395030
+ // Use less memory
+ ImageInstallation::FreeInternalVariables();
return `auto;
}
@@ -223,7 +226,7 @@
// TRANSLATORS: help idi#3
_("<p>Installation from images is faster than installation from RPM packages
-because it does not need to handle with with RPM database, locks etc.
+because it does not need to handle with RPM database, locks etc.
One of the images also contains the joint RPM database and other metadata.</p>") +
// TRANSLATORS: help idi#4
@@ -255,6 +258,10 @@
ImageInstallation::RestoreAllChanges();
+// bnc #395030
+// Use less memory
+ImageInstallation::FreeInternalVariables();
+
return `next;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.50/src/clients/inst_license.ycp new/yast2-installation-2.17.0/src/clients/inst_license.ycp
--- old/yast2-installation-2.16.50/src/clients/inst_license.ycp 2008-05-30 13:19:37.000000000 +0200
+++ new/yast2-installation-2.17.0/src/clients/inst_license.ycp 2008-06-04 12:03:30.000000000 +0200
@@ -3,8 +3,10 @@
* Package: Installation
* Summary: Generic License File
* Authors: Anas Nashif
+ * Jiri Srain
+ * Lukas Ocilka
*
- * $Id: inst_license.ycp 41430 2007-10-15 14:01:48Z locilka $
+ * $Id: inst_license.ycp 48052 2008-06-04 10:03:29Z locilka $
*
*/
@@ -18,13 +20,9 @@
import "ProductLicense";
import "Mode";
-map display = UI::GetDisplayInfo();
-integer space = display["TextMode"]:true ? 1 : 3;
-
// all the arguments
map argmap = GetInstArgs::argmap();
-
// Action if license is not accepted
// abort|continue|halt
// halt is the default
@@ -40,22 +38,18 @@
symbol ask_ret = nil;
-string text = "";
-
if (Stage::initial ())
{
ask_ret = ProductLicense::AskFirstStageLicenseAgreement (action);
}
else
{
- list<string> default_patterns = ["info.txt"];
- string directory = argmap["directory"]:"/var/lib/YaST2";
+ string directory = argmap["directory"]:Directory::etcdir + "/license/";
if (argmap["directory"]:"" != "")
directory = Directory::custom_workflow_dir + directory;
- list<string> patterns = argmap["patterns"]:default_patterns;
- ask_ret = ProductLicense::AskInstalledLicenseAgreement (directory,
- patterns, action);
+ // patterns are hardcoded
+ ask_ret = ProductLicense::AskInstalledLicenseAgreement (directory, [], action);
}
if (ask_ret == nil || ask_ret == `auto)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.50/src/clients/inst_pre_install.ycp new/yast2-installation-2.17.0/src/clients/inst_pre_install.ycp
--- old/yast2-installation-2.16.50/src/clients/inst_pre_install.ycp 2008-05-30 13:19:37.000000000 +0200
+++ new/yast2-installation-2.17.0/src/clients/inst_pre_install.ycp 2008-06-03 13:44:43.000000000 +0200
@@ -108,6 +108,17 @@
string partition_device = (string) partition["device"]:"";
y2milestone("Mounting %1 to %2", partition_device, mnt_tmpdir);
+ string already_mounted = sformat ("grep '[\\t ]%1[\\t ]' /proc/mounts", mnt_tmpdir);
+ integer am_exit = (integer) SCR::Execute (.target.bash, already_mounted);
+
+ if (am_exit != 0) {
+ y2warning ("%1 is already mounted, trying to umount...", mnt_tmpdir);
+ integer umount = (integer) SCR::Execute (.target.umount, mnt_tmpdir);
+ if (umount != 0) {
+ y2error ("Cannot umount %1", mnt_tmpdir);
+ }
+ }
+
// mounting read-only
if (! (boolean) SCR::Execute(.target.mount, [partition_device, mnt_tmpdir], "-o ro")) {
y2error("Mounting falied!");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.50/src/clients/inst_proposal.ycp new/yast2-installation-2.17.0/src/clients/inst_proposal.ycp
--- old/yast2-installation-2.16.50/src/clients/inst_proposal.ycp 2008-05-30 13:19:37.000000000 +0200
+++ new/yast2-installation-2.17.0/src/clients/inst_proposal.ycp 2008-06-26 12:47:58.000000000 +0200
@@ -7,7 +7,7 @@
* Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_proposal.ycp 47130 2008-04-28 15:51:10Z locilka $
+ * $Id: inst_proposal.ycp 48534 2008-06-25 14:45:34Z ug $
*
* Create and display reasonable proposal for basic
* installation and call sub-workflows as required
@@ -635,6 +635,10 @@
return ! contains (submodules, m);
});
submodules = (list<string>)merge (submodules, display_only_modules);
+ list <string> p = AutoinstConfig::getProposalList();
+ submodules_presentation = filter (string v, submodules_presentation, {
+ return ( contains( p, v ) || p == [] );
+ });
}
else
{
@@ -646,6 +650,10 @@
// setup the list
submodules_presentation = maplist (list mod, modules, ``(mod[0]:"") );
+ list <string> p = AutoinstConfig::getProposalList();
+ submodules_presentation = filter (string v, submodules_presentation, {
+ return ( contains( p, v ) || p == [] );
+ });
}
y2milestone ("Presentation order: %1", submodules_presentation);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.50/src/clients/inst_release_notes.ycp new/yast2-installation-2.17.0/src/clients/inst_release_notes.ycp
--- old/yast2-installation-2.16.50/src/clients/inst_release_notes.ycp 2008-05-30 13:19:37.000000000 +0200
+++ new/yast2-installation-2.17.0/src/clients/inst_release_notes.ycp 2008-07-10 13:31:22.000000000 +0200
@@ -8,7 +8,7 @@
*
* Display release notes.
*
- * $Id: inst_release_notes.ycp 46923 2008-04-21 14:18:17Z locilka $
+ * $Id: inst_release_notes.ycp 48956 2008-07-10 11:31:22Z locilka $
*/
{
@@ -80,6 +80,19 @@
// Release notes might be missing
if (FileUtils::Exists(basedirectory) && FileUtils::IsDirectory(basedirectory)) {
readproducts = (list<string>) SCR::Read(.target.dir, basedirectory);
+
+ // bnc #407922
+ // not all objects need to be directories
+ boolean is_directory = nil;
+ readproducts = filter (string one_prod, readproducts, {
+ is_directory = FileUtils::IsDirectory (sformat ("%1/%2", basedirectory, one_prod));
+
+ if (is_directory != true) {
+ y2warning ("'%1' in '%2' is not a directory", one_prod, basedirectory);
+ }
+
+ return is_directory;
+ });
}
map languages_translations = CreateLanguagesTranslations();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.50/src/clients/inst_rpmcopy_secondstage.ycp new/yast2-installation-2.17.0/src/clients/inst_rpmcopy_secondstage.ycp
--- old/yast2-installation-2.16.50/src/clients/inst_rpmcopy_secondstage.ycp 2008-05-30 13:19:37.000000000 +0200
+++ new/yast2-installation-2.17.0/src/clients/inst_rpmcopy_secondstage.ycp 2008-07-09 15:04:25.000000000 +0200
@@ -1,11 +1,14 @@
/**
* This client just calls inst_rpmcopy and returns the result.
- * If automatic installation is used, inst_rpmcopy is disabled,
+ *
+ * If automatic configuration is used, inst_rpmcopy is disabled,
* which not only diables it in second stage (wanted) but also
* disables it in first stage.
+ *
* This client is used in second stage.
*/
{
+ y2milestone ("inst_rpmcopy_secondstage calling inst_rpmcopy");
return WFM::CallFunction ("inst_rpmcopy", WFM::Args());
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.50/src/clients/inst_system_analysis.ycp new/yast2-installation-2.17.0/src/clients/inst_system_analysis.ycp
--- old/yast2-installation-2.16.50/src/clients/inst_system_analysis.ycp 2008-05-30 13:19:37.000000000 +0200
+++ new/yast2-installation-2.17.0/src/clients/inst_system_analysis.ycp 2008-06-06 12:47:50.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_system_analysis.ycp 47922 2008-05-28 14:35:05Z ug $
+ * $Id: inst_system_analysis.ycp 47998 2008-06-02 16:24:49Z locilka $
*
*/
@@ -198,52 +198,6 @@
// <-- Function definitions
-
-
-map display_info = UI::GetDisplayInfo();
-boolean in_textmode = display_info["TextMode"]:false;
-
-string GenerateIconID (any icon_whatever) {
- return sformat ("icon_%1", tostring (icon_whatever));
-}
-
-/**
- * Function creates term containing radio button and icon
- * based on current display (graphical/textual)
- *
- * @param string radio button label
- * @param symbol radio button id
- * @param string path to an image
- * @boolean whether selected (more than one buttons selected don't make sense!)
- */
- term CreateRadioButtonTerm (string button_label, symbol button_id, string icon_file, boolean selected) {
- return `HBox (
- (in_textmode ?
- `Empty()
- :
- `HWeight (
- 1,
- (icon_file == "" ?
- `Empty()
- :
- `Image (`id (GenerateIconID (button_id)), icon_file, "")
- )
- )
- ),
- `HWeight(
- 5,
- `Left (`RadioButton (
- `id (button_id),
- `opt(`notify),
- button_label,
- selected
- ))
- )
- );
-}
-
-
-
Wizard::SetContents (_("Analyzing the Computer"), `Empty (), "", false, false);
Wizard::SetTitleIcon ("yast-controller");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.50/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.17.0/src/clients/inst_upgrade_urls.ycp
--- old/yast2-installation-2.16.50/src/clients/inst_upgrade_urls.ycp 2008-05-30 13:19:37.000000000 +0200
+++ new/yast2-installation-2.17.0/src/clients/inst_upgrade_urls.ycp 2008-06-12 18:04:54.000000000 +0200
@@ -15,6 +15,7 @@
import "Popup";
import "AddOnProduct";
import "Report";
+ import "PackageCallbacks";
textdomain "installation";
@@ -502,6 +503,45 @@
Wizard::SetTitleIcon ("yast-sw_source");
}
+ void SetAddRemoveSourcesProgress (
+ list <integer> & sources_to_remove, list <string> & sources_to_add,
+ list <string> & sources_to_add_disabled
+ ) {
+ list <string> actions_todo = [];
+ list <string> actions_doing = [];
+
+ integer steps_nr = 0;
+
+ if (size (sources_to_remove) > 0) {
+ actions_todo = add (actions_todo, _("Remove unused repositories"));
+ actions_doing = add (actions_doing, _("Removing unused repositories..."));
+ steps_nr = steps_nr + size (sources_to_remove);
+ }
+
+ if (size (sources_to_add) > 0) {
+ actions_todo = add (actions_todo, _("Add enabled repositories"));
+ actions_doing = add (actions_doing, _("Adding enabled repositories..."));
+ steps_nr = steps_nr + size (sources_to_add);
+ }
+
+ if (size (sources_to_add_disabled) > 0) {
+ actions_todo = add (actions_todo, _("Add disabled repositories"));
+ actions_doing = add (actions_doing, _("Adding disabled repositories..."));
+ steps_nr = steps_nr + size (sources_to_add_disabled);
+ }
+
+ Progress::New (
+ // TRANSLATORS: dialog caption
+ _("Previously Used Repositories"),
+ _("Adding and removing repositories..."),
+ steps_nr,
+ actions_todo,
+ actions_doing,
+ // TRANSLATORS: help text
+ _("<p>Please wait while repositories are being added and removed.</p>")
+ );
+ }
+
// See bnc #309317
string GetUniqueAlias (string alias_orig) {
if (alias_orig == nil) alias_orig = "";
@@ -561,47 +601,17 @@
});
}
- symbol AddOrRemoveSources () {
- list <integer> sources_to_remove = [];
- list <string> sources_to_add = [];
-
- map id_to_url = $[];
-
- // bnc #308763
- list <string> sources_to_add_disabled = [];
-
- foreach (map one_source, urls, {
- string url = one_source["url"]:"";
- string id = one_source["id"]:"";
-
- id_to_url[id] = url;
-
- integer current_medianr = FindURLMediaNr (url);
-
- // Source should be enabled at the end
- if (one_source["url_will_be_enabled"]:nil == true) {
- if (current_medianr == nil) {
- sources_to_add = add (sources_to_add, id);
- }
-
- // Source should be disabled at the end
- } else if (one_source["url_will_be_enabled"]:nil == false) {
- // already registered
- if (current_medianr != nil) {
- sources_to_remove = add (sources_to_remove, current_medianr);
- }
-
- // will be added
- sources_to_add_disabled = add (sources_to_add_disabled, id);
- }
- });
-
- if (size(sources_to_remove) > 0 || size (sources_to_add) > 0) {
- SetAddRemoveSourcesUI();
+ void IUU_RemoveRepositories (list <integer> sources_to_remove) {
+ if (size (sources_to_remove) == 0) {
+ return;
}
+ Progress::Title (_("Removing unused repositories..."));
+ Progress::NextStage ();
+
y2milestone ("Deleting repos: %1", sources_to_remove);
foreach (integer one_id, sources_to_remove, {
+ Progress::NextStep ();
Pkg::SourceDelete (one_id);
AddOnProduct::add_on_products = (list