Hello community,
here is the log from the commit of package yast2-packager
checked in at Wed May 3 14:06:18 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-05-02 21:37:08.000000000 +0200
+++ STABLE/yast2-packager/yast2-packager.changes 2006-05-03 13:42:58.000000000 +0200
@@ -2,22 +1,0 @@
-Tue May 2 21:33:20 CEST 2006 - locilka@suse.cz
-
-- Allways install from all media when Packages::metadir_used is set
- to true. This adds the missing functionality to the previous fix.
-- 2.13.107
-
--------------------------------------------------------------------
-Tue May 2 15:08:42 CEST 2006 - locilka@suse.cz
-
-- Splitting inst_rpmcopy source code into smaller functions
-- Calling first stage installation packages commit limited to first
- media, unlimited in other cases (such as second stage
- installation) (#170079)
-- 2.13.106
-
--------------------------------------------------------------------
-Tue May 2 14:43:30 CEST 2006 - mvidner@suse.cz
-
-- Reverted the redirection, ag_background will be changed instead
- (#169648#c39).
-
--------------------------------------------------------------------
Old:
----
yast2-packager-2.13.107.tar.bz2
New:
----
yast2-packager-2.13.105.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.ZGeMoJ/_old 2006-05-03 14:06:05.000000000 +0200
+++ /var/tmp/diff_new_pack.ZGeMoJ/_new 2006-05-03 14:06:05.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.107)
+# spec file for package yast2-packager (Version 2.13.105)
#
# 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.107
+Version: 2.13.105
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.107.tar.bz2
+Source0: yast2-packager-2.13.105.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.107
+%setup -n yast2-packager-2.13.105
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,19 +78,6 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
-* Tue May 02 2006 - locilka@suse.cz
-- Allways install from all media when Packages::metadir_used is set
- to true. This adds the missing functionality to the previous fix.
-- 2.13.107
-* Tue May 02 2006 - locilka@suse.cz
-- Splitting inst_rpmcopy source code into smaller functions
-- Calling first stage installation packages commit limited to first
- media, unlimited in other cases (such as second stage
- installation) (#170079)
-- 2.13.106
-* Tue May 02 2006 - mvidner@suse.cz
-- Reverted the redirection, ag_background will be changed instead
- (#169648#c39).
* Tue May 02 2006 - mvidner@suse.cz
- Redirect rug stdout to null because it can block (#169648).
- Sometimes rug ping gives the exit code 0xff_ffff_ffff_ffff so
++++++ yast2-packager-2.13.107.tar.bz2 -> yast2-packager-2.13.105.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.107/VERSION new/yast2-packager-2.13.105/VERSION
--- old/yast2-packager-2.13.107/VERSION 2006-05-02 21:33:12.000000000 +0200
+++ new/yast2-packager-2.13.105/VERSION 2006-05-03 13:51:58.000000000 +0200
@@ -1 +1 @@
-2.13.107
+2.13.105
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.107/configure new/yast2-packager-2.13.105/configure
--- old/yast2-packager-2.13.107/configure 2006-05-02 21:40:03.000000000 +0200
+++ new/yast2-packager-2.13.105/configure 2006-05-03 13:53:43.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.107.
+# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.105.
#
# 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.107'
-PACKAGE_STRING='yast2-packager 2.13.107'
+PACKAGE_VERSION='2.13.105'
+PACKAGE_STRING='yast2-packager 2.13.105'
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.107 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.13.105 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.107:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.13.105:";;
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.107
+yast2-packager configure 2.13.105
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.107, which was
+It was created by yast2-packager $as_me 2.13.105, 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.107'
+ VERSION='2.13.105'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.107"
+VERSION="2.13.105"
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.107, which was
+This file was extended by yast2-packager $as_me 2.13.105, 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.107
+yast2-packager config.status 2.13.105
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.107/configure.in new/yast2-packager-2.13.105/configure.in
--- old/yast2-packager-2.13.107/configure.in 2006-05-02 21:39:59.000000000 +0200
+++ new/yast2-packager-2.13.105/configure.in 2006-05-03 13:53:39.000000000 +0200
@@ -3,7 +3,7 @@
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.107, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.105, 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.107"
+VERSION="2.13.105"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.107/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.13.105/src/clients/inst_rpmcopy.ycp
--- old/yast2-packager-2.13.107/src/clients/inst_rpmcopy.ycp 2006-05-02 21:38:08.000000000 +0200
+++ new/yast2-packager-2.13.105/src/clients/inst_rpmcopy.ycp 2006-05-03 13:42:48.000000000 +0200
@@ -13,7 +13,7 @@
* Packages module :
* "installed"
*
- * $Id: inst_rpmcopy.ycp 30628 2006-05-02 19:38:01Z locilka $
+ * $Id: inst_rpmcopy.ycp 29756 2006-04-05 16:09:06Z mvidner $
*/
{
@@ -500,50 +500,54 @@
// end of installation source caching functions
// ------------------------------------------------------------------------------------------------------
- // ------------------------------------------------------------------------------------------------------
- // begin of commit installation functions
- // ------------------------------------------------------------------------------------------------------
+ Pkg::SetLocale (Language::language);
- void InstallRemainingAndBinarySource () {
- // second stage of package installation, re-read list of remaining binary and source
- // packages
+ SlideShow::SetLanguage (Language::language);
- list<string> remaining = (list<string>) SCR::Read (.target.ycp, ["/var/lib/YaST2/remaining", []]);
- if (remaining == nil)
- remaining = [];
+ // start target, create new rpmdb if none is existing
+ // FIXME error checking is missing all around here, initialization could actually fail!
+ //Pkg::TargetInit (Installation::destdir, true);
+ if(Pkg::TargetInit (Installation::destdir,true) != true)
+ {
+ // continue-cancel popup
+ if(Popup::ContinueCancel(_("Initializing the target directory failed")) == false)
+ {
+ return `abort;
+ }
+ }
- list<string> srcremaining = (list<string>) SCR::Read (.target.ycp, ["/var/lib/YaST2/srcremaining", []]);
- if (srcremaining == nil)
- srcremaining = [];
- string backupPath = (string) SCR::Read(.target.string, [Installation::destdir + "/var/lib/YaST2/backup_path", ""]);
- if ( backupPath != nil && backupPath != "")
- {
- y2milestone("create package backups in %1",backupPath);
- Pkg::CreateBackups (true);
- Pkg::SetBackupPath (backupPath);
- }
+ if (Stage::cont ())
+ {
+ // initialize the package agent in continue mode
+ Packages::Init( true );
+ RestoreDiskCacheSettings ();
+ }
- integer failed_packages = 0;
- y2milestone ("%1 binary packages remaining", size (remaining));
- foreach (string pkg, remaining, ``{
- if (! Pkg::PkgInstall (pkg))
- failed_packages = failed_packages + 1;
- });
+ SlideShow::OpenSlideShowDialog ();
- y2milestone ("%1 source packages remaining", size (srcremaining));
- foreach (string pkg, srcremaining, ``{
- if (! Pkg::PkgSrcInstall (pkg))
- failed_packages = failed_packages + 1;
- });
- if (failed_packages > 0)
+ Pkg::TargetLogfile (Installation::destdir + Directory::logdir + "/y2logRPM");
+
+
+ if (Mode::autoinst ()
+ && Stage::cont ())
+ {
+ import "AutoinstSoftware";
+
+ // post packages from autoinstall
+ map res = Pkg::DoProvide (AutoinstSoftware::post_packages);
+ if (size (res) > 0)
{
- // error report, %1 is number
- Report::Error (sformat(_("Failed to select %1 packages for installation"), failed_packages));
+ foreach (string s, any a, res, ``{
+ y2warning ("Pkg::DoProvide failed for %1: %2", s, a);
+ });
}
+
+ Pkg::PkgSolve (false);
}
- void InstInitAndInitialSourceCaching () {
+ if (Stage::initial ()) // initial mode, move download area, check for source caching
+ {
map spaces = Pkg::TargetGetDU ();
list root_info = spaces["/tmp"]:spaces["/tmp/"]:spaces["/"]:[];
integer total = root_info[0]:0;
@@ -616,30 +620,83 @@
}
}
}
+ else // continue mode, check for remaining packages
+ {
+ // second stage of package installation, re-read list of remaining binary and source
+ // packages
- void AutoinstPostPackages () {
- import "AutoinstSoftware";
+ list<string> remaining = (list<string>) SCR::Read (.target.ycp, ["/var/lib/YaST2/remaining", []]);
+ if (remaining == nil)
+ remaining = [];
- // post packages from autoinstall
- map res = Pkg::DoProvide (AutoinstSoftware::post_packages);
- if (size (res) > 0)
+ list<string> srcremaining = (list<string>) SCR::Read (.target.ycp, ["/var/lib/YaST2/srcremaining", []]);
+ if (srcremaining == nil)
+ srcremaining = [];
+
+ string backupPath = (string) SCR::Read(.target.string, [Installation::destdir + "/var/lib/YaST2/backup_path", ""]);
+ if ( backupPath != nil && backupPath != "")
{
- foreach (string s, any a, res, ``{
- y2warning ("Pkg::DoProvide failed for %1: %2", s, a);
- });
+ y2milestone("create package backups in %1",backupPath);
+ Pkg::CreateBackups (true);
+ Pkg::SetBackupPath (backupPath);
}
- Pkg::PkgSolve (false);
+ integer failed_packages = 0;
+ y2milestone ("%1 binary packages remaining", size (remaining));
+ foreach (string pkg, remaining, ``{
+ if (! Pkg::PkgInstall (pkg))
+ failed_packages = failed_packages + 1;
+ });
+
+ y2milestone ("%1 source packages remaining", size (srcremaining));
+ foreach (string pkg, srcremaining, ``{
+ if (! Pkg::PkgSrcInstall (pkg))
+ failed_packages = failed_packages + 1;
+ });
+ if (failed_packages > 0)
+ {
+ // error report, %1 is number
+ Report::Error (sformat(_("Failed to select %1 packages for installation"), failed_packages));
+ }
}
- symbol InstallPackagesFromMedia (integer current_cd_no, integer maxnumbercds) {
- symbol result = `next;
+ // Install the software from Medium1 to Mediummax, but not the already
+ // installed base packages.
+ // This part is also used for installation in running system (Stage::cont ())
- y2milestone("Installing packages from media %1 -> %2", current_cd_no, maxnumbercds);
+ integer maxnumbercds = 10;
+ integer current_cd_no = 1;
- // 1->1 for default fist stage installation
- // 0->0 for default second stage (or other) installation
- while (current_cd_no <= maxnumbercds) {
+ if (Stage::initial ())
+ {
+ maxnumbercds = 1; // only the first CD will be installed
+ }
+ else if (Mode::autoinst () && Stage::cont () && size( AutoinstSoftware::post_packages ) > 0)
+ {
+ // one more compatibility feature to old YaST, post-packages
+ // Simply install a list of package after initial installation (only
+ // makes sense with nfs installatons)
+ current_cd_no = 1;
+ }
+ else if (Stage::cont ())
+ {
+ current_cd_no = 2; // continue with second CD but only in continue mode
+ }
+ else if (DirInstall::installing_into_dir)
+ {
+ current_cd_no = 1;
+ }
+
+ if (Packages::metadir_used) // all is in ramdisk
+ {
+ current_cd_no = 0; // we can install all sources now
+ maxnumbercds = 0;
+ }
+
+ symbol result = `next;
+
+ while (current_cd_no <= maxnumbercds)
+ {
boolean go_on = true;
list