Mailinglist Archive: opensuse-commit (1262 mails)

< Previous Next >
commit yast2-packager
  • From: root@xxxxxxx (h_root)
  • Date: Mon, 4 Sep 2006 17:57:14 +0200 (CEST)
  • Message-id: <20060904155714.EF86CAA9E9@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-packager
checked in at Mon Sep 4 17:57:14 CEST 2006.

--------
--- yast2-packager/yast2-packager.changes 2006-08-18 10:39:46.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-09-04 16:15:31.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Sep 4 13:45:13 CEST 2006 - lslezak@xxxxxxx
+
+- install all packages in the first stage if it's possible
+ (feature #3425, bugzilla #103800)
+- 2.13.147
+
+-------------------------------------------------------------------

Old:
----
yast2-packager-2.13.146.tar.bz2

New:
----
yast2-packager-2.13.147.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.pzChii/_old 2006-09-04 17:56:43.000000000 +0200
+++ /var/tmp/diff_new_pack.pzChii/_new 2006-09-04 17:56:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.146)
+# spec file for package yast2-packager (Version 2.13.147)
#
# 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.146
+Version: 2.13.147
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.146.tar.bz2
+Source0: yast2-packager-2.13.147.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-firewall yast2-installation yast2-slp yast2-testsuite yast2-xml
Requires: checkmedia yast2-country
@@ -47,7 +47,7 @@
Arvin Schnell <arvin@xxxxxxx>

%prep
-%setup -n yast2-packager-2.13.146
+%setup -n yast2-packager-2.13.147

%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +84,10 @@
%doc %{prefix}/share/doc/packages/yast2-packager

%changelog -n yast2-packager
+* Mon Sep 04 2006 - lslezak@xxxxxxx
+- install all packages in the first stage if it's possible
+ (feature #3425, bugzilla #103800)
+- 2.13.147
* Fri Aug 18 2006 - jsrain@xxxxxxx
- syntax fix
- 2.13.146

++++++ yast2-packager-2.13.146.tar.bz2 -> yast2-packager-2.13.147.tar.bz2 ++++++
++++ 2287 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-packager-2.13.146/VERSION new/yast2-packager-2.13.147/VERSION
--- old/yast2-packager-2.13.146/VERSION 2006-08-18 10:02:34.000000000 +0200
+++ new/yast2-packager-2.13.147/VERSION 2006-09-04 13:43:31.000000000 +0200
@@ -1 +1 @@
-2.13.146
+2.13.147
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-packager-2.13.146/configure.in new/yast2-packager-2.13.147/configure.in
--- old/yast2-packager-2.13.146/configure.in 2006-08-18 10:26:09.000000000 +0200
+++ new/yast2-packager-2.13.147/configure.in 2006-09-04 15:50:16.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.22 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-packager, 2.13.146, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.13.147, http://bugs.opensuse.org/, 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.146"
+VERSION="2.13.147"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"

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-packager-2.13.146/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.13.147/src/clients/inst_rpmcopy.ycp
--- old/yast2-packager-2.13.146/src/clients/inst_rpmcopy.ycp 2006-08-09 13:48:33.000000000 +0200
+++ new/yast2-packager-2.13.147/src/clients/inst_rpmcopy.ycp 2006-09-04 16:11:39.000000000 +0200
@@ -13,7 +13,7 @@
* Packages module :
* "installed"
*
- * $Id: inst_rpmcopy.ycp 32260 2006-08-09 11:50:07Z jsrain $
+ * $Id: inst_rpmcopy.ycp 32691 2006-09-04 14:13:07Z lslezak $
*/

{
@@ -35,6 +35,7 @@
import "Kernel";
import "Service";
import "SourceManager";
+ import "Linuxrc";

// variables related to installation source caching

@@ -718,16 +719,26 @@
// Default - unrestricted
map <string, integer> ret = $["maxnumbercds" : 0, "current_cd_no" : 0];

-
+ // has the inst-sys been successfuly unmounted?
+ string umount_result = Linuxrc::InstallInf ("umount_result");
+ string media = Linuxrc::InstallInf ("InstMode");
+ y2milestone("umount result: %1, inst source type: %2", umount_result, media);
+
if (Packages::metadir_used) {
// all is in ramdisk, we can install all sources now, works in every stage
ret["current_cd_no"] = 0;
ret["maxnumbercds"] = 0;
y2milestone("StartingAndMaxMediaNumber: MetaDir used %1/%2", ret["current_cd_no"]:nil, ret["maxnumbercds"]:nil);
} else if (Stage::initial ()) {
- // only the first CD will be installed
- ret["current_cd_no"] = 1;
- ret["maxnumbercds"] = 1;
+ // is CD or DVD medium mounted? (inst-sys)
+ if (umount_result != "0" && (media == "cd" || media == "dvd"))
+ {
+ y2milestone("The installation CD/DVD cannot be changed.");
+ // only the first CD will be installed
+ ret["current_cd_no"] = 1;
+ ret["maxnumbercds"] = 1;
+ }
+ // otherwise use the default setting - install all media
y2milestone("StartingAndMaxMediaNumber: Stage initial %1/%2", ret["current_cd_no"]:nil, ret["maxnumbercds"]:nil);

// Three following cases have the same solution, CDstart = 0, CDfinish = 0
@@ -753,6 +764,8 @@
ret["maxnumbercds"] = 0; // was 10
y2milestone("StartingAndMaxMediaNumber: Dir install %1/%2", ret["current_cd_no"]:nil, ret["maxnumbercds"]:nil);
}
+
+ return ret;
}

// ------------------------------------------------------------------------------------------------------


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >