commit yast2-packager

2 May 2006

Hello community,

here is the log from the commit of package yast2-packager
checked in at Wed May 3 01:00:37 CEST 2006.

--------

--- yast2-packager/yast2-packager.changes	2006-05-02 15:09:07.000000000 +0200
+++ STABLE/yast2-packager/yast2-packager.changes	2006-05-02 21:37:08.000000000 +0200
@@ -1,0 +2,7 @@
+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
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.DId9Zl/_old	2006-05-03 01:00:21.000000000 +0200
+++ /var/tmp/diff_new_pack.DId9Zl/_new	2006-05-03 01:00:21.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-packager (Version 2.13.106)
+# spec file for package yast2-packager (Version 2.13.107)
 #
 # 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.106
+Version:        2.13.107
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-packager-2.13.106.tar.bz2
+Source0:        yast2-packager-2.13.107.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 <arvin@suse.de>
 
 %prep
-%setup -n yast2-packager-2.13.106
+%setup -n yast2-packager-2.13.107
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -79,6 +79,10 @@
 
 %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

++++++ yast2-packager-2.13.106.tar.bz2 -> yast2-packager-2.13.107.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.106/VERSION new/yast2-packager-2.13.107/VERSION
--- old/yast2-packager-2.13.106/VERSION	2006-05-02 15:01:25.000000000 +0200
+++ new/yast2-packager-2.13.107/VERSION	2006-05-02 21:33:12.000000000 +0200
@@ -1 +1 @@
-2.13.106
+2.13.107
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.106/configure new/yast2-packager-2.13.107/configure
--- old/yast2-packager-2.13.106/configure	2006-05-02 15:10:44.000000000 +0200
+++ new/yast2-packager-2.13.107/configure	2006-05-02 21:40:03.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.106.
+# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.107.
 #
 # 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.106'
-PACKAGE_STRING='yast2-packager 2.13.106'
+PACKAGE_VERSION='2.13.107'
+PACKAGE_STRING='yast2-packager 2.13.107'
 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.106 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.13.107 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.106:";;
+     short | recursive ) echo "Configuration of yast2-packager 2.13.107:";;
    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.106
+yast2-packager configure 2.13.107
 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.106, which was
+It was created by yast2-packager $as_me 2.13.107, 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.106'
+ VERSION='2.13.107'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
 
 
 
-VERSION="2.13.106"
+VERSION="2.13.107"
 RPMNAME="yast2-packager"
 MAINTAINER="Jiri Srain <jsrain@suse.cz>"
 
@@ -2695,7 +2695,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by yast2-packager $as_me 2.13.106, which was
+This file was extended by yast2-packager $as_me 2.13.107, 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.106
+yast2-packager config.status 2.13.107
 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.106/configure.in new/yast2-packager-2.13.107/configure.in
--- old/yast2-packager-2.13.106/configure.in	2006-05-02 15:10:39.000000000 +0200
+++ new/yast2-packager-2.13.107/configure.in	2006-05-02 21:39:59.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.106, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.107, 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.106"
+VERSION="2.13.107"
 RPMNAME="yast2-packager"
 MAINTAINER="Jiri Srain <jsrain@suse.cz>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.106/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.13.107/src/clients/inst_rpmcopy.ycp
--- old/yast2-packager-2.13.106/src/clients/inst_rpmcopy.ycp	2006-05-02 15:09:34.000000000 +0200
+++ new/yast2-packager-2.13.107/src/clients/inst_rpmcopy.ycp	2006-05-02 21:38:08.000000000 +0200
@@ -13,7 +13,7 @@
  * Packages module :
  *			"installed"
  *
- * $Id: inst_rpmcopy.ycp 30607 2006-05-02 13:09:30Z locilka $
+ * $Id: inst_rpmcopy.ycp 30628 2006-05-02 19:38:01Z locilka $
  */
 
 {
@@ -710,21 +710,22 @@
 	// Default - unrestricted
 	map <string, integer> ret = $["maxnumbercds" : 0, "current_cd_no" : 0];
 
-	if (Stage::initial ()) {
+	
+	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;
 	    y2milestone("StartingAndMaxMediaNumber: Stage initial %1/%2", ret["current_cd_no"]:nil, ret["maxnumbercds"]:nil);
 
-	// Four following cases have the same solution, CDstart = 0, CDfinish = 0
+	// Three following cases have the same solution, CDstart = 0, CDfinish = 0
 	// ZYPP should solve what it needs and when.
 	// Leaving it here as the backward compatibility if someone decides to change it back.
 
-	} else if (Packages::metadir_used) {
-	    // all is in ramdisk, we can install all sources now
-	    ret["current_cd_no"] = 0;
-	    ret["maxnumbercds"]  = 0;
-	    y2milestone("StartingAndMaxMediaNumber: MetaDir used %1/%2", ret["current_cd_no"]:nil, ret["maxnumbercds"]:nil);
 	} 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


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



Remember to have fun...

    

root＠suse.de

tags

participants (1)