Mailinglist Archive: opensuse-commit (1187 mails)

< Previous Next >
commit yast2-packager
  • From: root@xxxxxxx (h_root)
  • Date: Wed, 5 Apr 2006 01:03:48 +0200 (CEST)
  • Message-id: <20060404230348.869ED8BDBF@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-packager
checked in at Wed Apr 5 01:03:48 CEST 2006.

--------
--- yast2-packager/yast2-packager.changes 2006-04-04 17:03:56.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-04-04 19:53:40.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Apr 4 19:34:53 CEST 2006 - jsrain@xxxxxxx
+
+- fixed servicepack.tgz integration
+- added support for loopback mounted ISO (#159565)
+- 2.13.59
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.9mh8SH/_old 2006-04-05 01:03:43.000000000 +0200
+++ /var/tmp/diff_new_pack.9mh8SH/_new 2006-04-05 01:03:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.58)
+# spec file for package yast2-packager (Version 2.13.59)
#
# 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.58
+Version: 2.13.59
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.58.tar.bz2
+Source0: yast2-packager-2.13.59.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@xxxxxxx>

%prep
-%setup -n yast2-packager-2.13.58
+%setup -n yast2-packager-2.13.59

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

%changelog -n yast2-packager
+* Tue Apr 04 2006 - jsrain@xxxxxxx
+- fixed servicepack.tgz integration
+- added support for loopback mounted ISO (#159565)
+- 2.13.59
* Tue Apr 04 2006 - mvidner@xxxxxxx
- Call rug sa for all known installation sources,
using the URL+alias instead of /installation (#156030).

++++++ yast2-packager-2.13.58.tar.bz2 -> yast2-packager-2.13.59.tar.bz2 ++++++
++++ 2248 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.58/VERSION new/yast2-packager-2.13.59/VERSION
--- old/yast2-packager-2.13.58/VERSION 2006-04-04 16:33:47.000000000 +0200
+++ new/yast2-packager-2.13.59/VERSION 2006-04-04 19:51:07.000000000 +0200
@@ -1 +1 @@
-2.13.58
+2.13.59
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.58/configure.in new/yast2-packager-2.13.59/configure.in
--- old/yast2-packager-2.13.58/configure.in 2006-04-04 16:35:04.000000000 +0200
+++ new/yast2-packager-2.13.59/configure.in 2006-04-04 19:53:47.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-packager, 2.13.58, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.59, 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.58"
+VERSION="2.13.59"
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.58/src/modules/InstURL.ycp new/yast2-packager-2.13.59/src/modules/InstURL.ycp
--- old/yast2-packager-2.13.58/src/modules/InstURL.ycp 2006-03-14 17:25:55.000000000 +0100
+++ new/yast2-packager-2.13.59/src/modules/InstURL.ycp 2006-04-04 19:35:30.000000000 +0200
@@ -6,7 +6,7 @@
* Purpose: Convert /etc/install.inf data to URL
*
*
- * $Id: InstURL.ycp 28928 2006-03-13 22:34:20Z jsrain $
+ * $Id: InstURL.ycp 29680 2006-04-04 17:34:37Z jsrain $
*/

{
@@ -177,7 +177,23 @@

} // is_network

+ string isoimg = "";
string serverdir = Linuxrc::InstallInf("Serverdir");
+ if (Linuxrc::InstallInf("SourceType") == "file")
+ {
+ if (serverdir != "" && serverdir != nil)
+ {
+ list<string> sd_items = splitstring (serverdir, "/");
+ sd_items = filter (string i, sd_items, {
+ return i != "";
+ });
+ integer last = size (sd_items) - 1;
+ isoimg = sd_items[last]:"";
+ sd_items[last] = "";
+ serverdir = mergestring (sd_items, "/");
+ }
+ }
+
/*
if (((instmode == "hd") || is_network) // if serverdir needed
&& ((serverdir != nil) && (serverdir != ""))) // and is valid
@@ -289,6 +305,12 @@
option_separator = "&";
y2milestone ("options %1", options);
}
+
+ if (isoimg != "")
+ {
+ url = sformat ("iso:/?iso=%1&url=%2", isoimg, url);
+ }
+
y2debug ("URL %1", HidePassword(url));
return url;
}
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.58/src/modules/Packages.ycp new/yast2-packager-2.13.59/src/modules/Packages.ycp
--- old/yast2-packager-2.13.58/src/modules/Packages.ycp 2006-03-28 15:54:37.000000000 +0200
+++ new/yast2-packager-2.13.59/src/modules/Packages.ycp 2006-04-04 18:05:33.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif <nashif@xxxxxxx>
*
- * $Id: Packages.ycp 29455 2006-03-28 09:32:49Z visnov $
+ * $Id: Packages.ycp 29674 2006-04-04 16:04:42Z jsrain $
*/

{
@@ -11,6 +11,7 @@

textdomain "packager";

+ import "AddOnProduct";
import "Arch";
import "Directory";
import "InstURL";
@@ -565,6 +566,29 @@
y2milestone ("No order file, doing single source installation");
theSources = [ initial_source ];

+ if (servicepack_available)
+ {
+ string spdir = metadir + "/Service-Pack/CD1";
+ WFM::Execute (.local.mkdir, spdir);
+ y2milestone ("Filling %1", spdir);
+ WFM::Execute(.local.bash, "tar -zxvf " +
+ servicepack_metadata + " -C " + spdir);
+ if ((integer)WFM::Read (.local.size, spdir + "/installation.xml") > 0)
+ {
+ AddOnProduct::WFIntegrate (spdir + "/installation.xml");
+ }
+ string sp_url = "dir:" + spdir;
+ integer sp_source = Pkg::SourceCreate (sp_url, "");
+ if (sp_source == -1)
+ Report::Error (_("Failed to integrate service pack source"));
+ else
+ {
+ theSources = add (theSources, sp_source);
+ y2internal ("Service pack source: %1, changing to URL: %2", sp_source, base_url);
+ Pkg::SourceChangeUrl (sp_source, base_url);
+ }
+ }
+
if (ProductFeatures::GetFeature ("software", "selection_type") == `fixed)
{
Pkg::SetSelection (ProductFeatures::GetStringFeature ("software", "base_selection"));
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.58/testsuite/tests/insturl-iso.out new/yast2-packager-2.13.59/testsuite/tests/insturl-iso.out
--- old/yast2-packager-2.13.58/testsuite/tests/insturl-iso.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.13.59/testsuite/tests/insturl-iso.out 2006-04-04 18:53:31.000000000 +0200
@@ -0,0 +1,10 @@
+Read .target.tmpdir "/tmp"
+Read .target.size "/etc/install.inf" 1
+Dir .etc.install_inf: ["InstMode", "Server", "Serverdir", "SourceType"]
+Read .etc.install_inf."InstMode" "nfs"
+Read .etc.install_inf."Server" "192.168.1.1"
+Read .etc.install_inf."Serverdir" "/install/images/CD1.iso"
+Read .etc.install_inf."SourceType" "file"
+Return iso:/?iso=CD1.iso&url=nfs://192.168.1.1/install/images/
+Return iso:/?iso=CD1.iso&url=nfs://192.168.1.1/install/images/test
+Return iso:/?iso=CD1.iso&url=nfs://192.168.1.1/install/images/test
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.58/testsuite/tests/insturl-iso.ycp new/yast2-packager-2.13.59/testsuite/tests/insturl-iso.ycp
--- old/yast2-packager-2.13.58/testsuite/tests/insturl-iso.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.13.59/testsuite/tests/insturl-iso.ycp 2006-04-04 18:49:13.000000000 +0200
@@ -0,0 +1,25 @@
+{
+ include "testsuite.ycp";
+ map READ = $[
+ "target" : $[
+ "size" : 1,
+ "tmpdir" : "/tmp",
+ ],
+ "etc" : $[
+ "install_inf": $[
+ "InstMode":"nfs",
+ "Server":"192.168.1.1",
+ "Serverdir":"/install/images/CD1.iso",
+ "SourceType":"file",
+ ]
+ ]
+ ];
+
+ TESTSUITE_INIT ([READ], nil);
+ import "InstURL";
+ import "Linuxrc";
+
+ TEST (``(InstURL::installInf2Url("")), [READ], nil);
+ TEST (``(InstURL::installInf2Url("test")), [READ], nil);
+ TEST (``(InstURL::installInf2Url("/test")), [READ], nil);
+}


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



Remember to have fun...


< Previous Next >