commit yast2-packager

24 May 2006

Hello community,

here is the log from the commit of package yast2-packager
checked in at Thu May 25 00:54:50 CEST 2006.

--------

--- yast2-packager/yast2-packager.changes	2006-05-16 15:50:15.000000000 +0200
+++ yast2-packager/yast2-packager.changes	2006-05-24 13:39:03.000000000 +0200
@@ -1,0 +2,20 @@
+Wed May 24 12:54:33 CEST 2006 - jsrain@suse.cz
+
+- properly integrate YCP code for add-on product installation if
+  add-on product media booted (if YCP code present) (#178311)
+- 2.13.119
+
+-------------------------------------------------------------------
+Fri May 19 10:35:24 CEST 2006 - jsrain@suse.cz
+
+- store ProductFeatures before starting package installation
+  (#176993)
+- 2.13.118
+
+-------------------------------------------------------------------
+Wed May 17 10:53:12 CEST 2006 - jsrain@suse.cz
+
+- decode %2f from FTP path from install.inf (#169310)
+- 2.13.117
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.miL3eY/_old	2006-05-25 00:54:38.000000000 +0200
+++ /var/tmp/diff_new_pack.miL3eY/_new	2006-05-25 00:54:38.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-packager (Version 2.13.116)
+# spec file for package yast2-packager (Version 2.13.119)
 #
 # 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.116
+Version:        2.13.119
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-packager-2.13.116.tar.bz2
+Source0:        yast2-packager-2.13.119.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.116
+%setup -n yast2-packager-2.13.119
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,17 @@
 %doc %{prefix}/share/doc/packages/yast2-packager
 
 %changelog -n yast2-packager
+* Wed May 24 2006 - jsrain@suse.cz
+- properly integrate YCP code for add-on product installation if
+  add-on product media booted (if YCP code present) (#178311)
+- 2.13.119
+* Fri May 19 2006 - jsrain@suse.cz
+- store ProductFeatures before starting package installation
+  (#176993)
+- 2.13.118
+* Wed May 17 2006 - jsrain@suse.cz
+- decode %%2f from FTP path from install.inf (#169310)
+- 2.13.117
 * Tue May 16 2006 - jsrain@suse.cz
 - don't use patterns required by product during autoinstallation
   (#159466)

++++++ yast2-packager-2.13.116.tar.bz2 -> yast2-packager-2.13.119.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/VERSION new/yast2-packager-2.13.119/VERSION
--- old/yast2-packager-2.13.116/VERSION	2006-05-16 15:40:05.000000000 +0200
+++ new/yast2-packager-2.13.119/VERSION	2006-05-24 13:04:23.000000000 +0200
@@ -1 +1 @@
-2.13.116
+2.13.119
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/configure new/yast2-packager-2.13.119/configure
--- old/yast2-packager-2.13.116/configure	2006-05-16 15:48:07.000000000 +0200
+++ new/yast2-packager-2.13.119/configure	2006-05-24 13:36:28.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.116.
+# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.119.
 #
 # Report bugs to <http://bugs.opensuse.org/>.
 #
@@ -269,8 +269,8 @@
 # Identity of this package.
 PACKAGE_NAME='yast2-packager'
 PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.13.116'
-PACKAGE_STRING='yast2-packager 2.13.116'
+PACKAGE_VERSION='2.13.119'
+PACKAGE_STRING='yast2-packager 2.13.119'
 PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
 
 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.116 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.13.119 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.116:";;
+     short | recursive ) echo "Configuration of yast2-packager 2.13.119:";;
    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.116
+yast2-packager configure 2.13.119
 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.116, which was
+It was created by yast2-packager $as_me 2.13.119, 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.116'
+ VERSION='2.13.119'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
 
 
 
-VERSION="2.13.116"
+VERSION="2.13.119"
 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.116, which was
+This file was extended by yast2-packager $as_me 2.13.119, 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.116
+yast2-packager config.status 2.13.119
 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.116/configure.in new/yast2-packager-2.13.119/configure.in
--- old/yast2-packager-2.13.116/configure.in	2006-05-16 15:48:03.000000000 +0200
+++ new/yast2-packager-2.13.119/configure.in	2006-05-24 13:36:16.000000000 +0200
@@ -3,7 +3,7 @@
 dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-packager, 2.13.116, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.13.119, 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.116"
+VERSION="2.13.119"
 RPMNAME="yast2-packager"
 MAINTAINER="Jiri Srain <jsrain@suse.cz>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/src/clients/inst_kickoff.ycp new/yast2-packager-2.13.119/src/clients/inst_kickoff.ycp
--- old/yast2-packager-2.13.116/src/clients/inst_kickoff.ycp	2006-05-11 13:45:48.000000000 +0200
+++ new/yast2-packager-2.13.119/src/clients/inst_kickoff.ycp	2006-05-19 10:03:12.000000000 +0200
@@ -24,6 +24,7 @@
     import "Kernel";
     import "Arch";
     import "FileUtils";
+    import "ProductFeatures";
 
 void AcpiToInitrd () {
     if (! (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ()))
@@ -392,5 +393,14 @@
 	SCR::Execute (.target.bash, "/bin/echo \"/etc/nothing\" >/proc/sys/kernel/modprobe");
     }
 
+    if (Stage::initial ())
+    {
+	ProductFeatures::Save();
+	WFM::Execute (.local.bash, sformat (
+	    "/bin/mkdir -p %1/etc/YaST2", Installation::destdir));
+	WFM::Execute (.local.bash, sformat (
+	    "/bin/cp %1 %2/%1", "/etc/YaST2/ProductFeatures", Installation::destdir));
+    }
+
     return `next;
 }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/src/modules/InstURL.ycp new/yast2-packager-2.13.119/src/modules/InstURL.ycp
--- old/yast2-packager-2.13.116/src/modules/InstURL.ycp	2006-05-03 14:05:56.000000000 +0200
+++ new/yast2-packager-2.13.119/src/modules/InstURL.ycp	2006-05-17 10:53:46.000000000 +0200
@@ -6,7 +6,7 @@
  * Purpose:		Convert /etc/install.inf data to URL
  *
  *
- * $Id: InstURL.ycp 29680 2006-04-04 17:34:37Z jsrain $
+ * $Id: InstURL.ycp 30961 2006-05-17 08:53:41Z jsrain $
  */
 
 {
@@ -233,6 +233,8 @@
                 // ftp://foo/bar is bar on foo (absolute)
                 // ftp://foo//bar is /bar on foo (relative)
 		// Note: %2f is added by URL.ycp if the path starts with /
+		if (substring (serverdir, 0, 3) == "%2f")
+		    serverdir = "/" + substring (serverdir, 3);
                 fs = serverdir;
 
             } else if (instmode == "smb" && (share != nil) && (share != "")) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/src/modules/Packages.ycp new/yast2-packager-2.13.119/src/modules/Packages.ycp
--- old/yast2-packager-2.13.116/src/modules/Packages.ycp	2006-05-16 15:34:50.000000000 +0200
+++ new/yast2-packager-2.13.119/src/modules/Packages.ycp	2006-05-24 12:55:18.000000000 +0200
@@ -3,7 +3,7 @@
  * Package:	Package selections
  * Authors:	Anas Nashif <nashif@suse.de>
  *
- * $Id: Packages.ycp 30943 2006-05-16 13:34:43Z jsrain $
+ * $Id: Packages.ycp 31125 2006-05-24 10:55:12Z jsrain $
  */
 
 {
@@ -639,7 +639,12 @@
 		{
 		    AddOnProduct::WFIntegrate (spdir + "/installation.xml");
 		}
+		if ((integer)WFM::Read (.local.size, spdir + "/y2update.tgz") > 0)
+		{
+		    AddOnProduct::UpdateInstSys (spdir + "/y2update.tgz");
+		}
 		string sp_url = "dir:" + spdir;
+		PackageCallbacksInit::InitPackageCallbacks ();
 		integer sp_source = Pkg::SourceCreate (sp_url, "");
 		if (sp_source == -1)
 		    Report::Error (_("Failed to integrate service pack source."));


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



Remember to have fun...

    

root＠suse.de

tags

participants (1)