Mailinglist Archive: opensuse-commit (1187 mails)

< Previous Next >
commit yast2-installation
  • From: root@xxxxxxx (h_root)
  • Date: Wed, 5 Apr 2006 17:57:37 +0200 (CEST)
  • Message-id: <20060405155737.1DD8A5221@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-installation
checked in at Wed Apr 5 17:57:37 CEST 2006.

--------
--- yast2-installation/yast2-installation.changes 2006-04-04 18:19:17.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2006-04-05 17:12:26.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Apr 5 17:05:27 CEST 2006 - jsrain@xxxxxxx
+
+- do not rewrite log from SCR running in chroot during installation
+- fix checking for duplicate sources (#159662)
+- 2.13.59
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.CZbgFq/_old 2006-04-05 17:55:55.000000000 +0200
+++ /var/tmp/diff_new_pack.CZbgFq/_new 2006-04-05 17:55:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.58)
+# spec file for package yast2-installation (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-installation
-Version: 2.13.58
+Version: 2.13.59
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.58.tar.bz2
+Source0: yast2-installation-2.13.59.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite
Requires: yast2 yast2-update
@@ -48,7 +48,7 @@
Arvin Schnell <arvin@xxxxxxx>

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

%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,10 @@
/usr/X11R6/share/fvwm/

%changelog -n yast2-installation
+* Wed Apr 05 2006 - jsrain@xxxxxxx
+- do not rewrite log from SCR running in chroot during installation
+- fix checking for duplicate sources (#159662)
+- 2.13.59
* Tue Apr 04 2006 - jdsn@xxxxxxx
- fixed w3m registration again (#162462)
- changed Requires to Recommends for suseRegister (hmuelle, aj)

++++++ yast2-installation-2.13.58.tar.bz2 -> yast2-installation-2.13.59.tar.bz2 ++++++
++++ 14117 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-installation-2.13.58/VERSION new/yast2-installation-2.13.59/VERSION
--- old/yast2-installation-2.13.58/VERSION 2006-04-04 15:33:44.000000000 +0200
+++ new/yast2-installation-2.13.59/VERSION 2006-04-05 17:06:50.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-installation-2.13.58/configure.in new/yast2-installation-2.13.59/configure.in
--- old/yast2-installation-2.13.58/configure.in 2006-04-04 18:17:23.000000000 +0200
+++ new/yast2-installation-2.13.59/configure.in 2006-04-05 17:12:13.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-installation, 2.13.58, http://www.suse.de/feedback, yast2-installation)
+AC_INIT(yast2-installation, 2.13.59, http://www.suse.de/feedback, yast2-installation)
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-installation"
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-installation-2.13.58/control/docs/control-doc.xml new/yast2-installation-2.13.59/control/docs/control-doc.xml
--- old/yast2-installation-2.13.58/control/docs/control-doc.xml 2006-03-15 16:33:54.000000000 +0100
+++ new/yast2-installation-2.13.59/control/docs/control-doc.xml 2006-02-02 19:55:05.000000000 +0100
@@ -28,7 +28,7 @@
0.1
</revnumber>
<date>
- $Date: 2004-10-27 16:25:24 +0200 (Wed, 27 Oct 2004) $
+ $Date: 2004-10-27 08:25:24 -0600 (Wed, 27 Oct 2004) $
</date>
<revremark>Initial Release as PDF</revremark>
</revision>
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-installation-2.13.58/src/clients/copy_logs_finish.ycp new/yast2-installation-2.13.59/src/clients/copy_logs_finish.ycp
--- old/yast2-installation-2.13.58/src/clients/copy_logs_finish.ycp 2006-03-15 16:33:55.000000000 +0100
+++ new/yast2-installation-2.13.59/src/clients/copy_logs_finish.ycp 2006-04-04 20:08:27.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: copy_logs_finish.ycp 27936 2006-02-13 20:01:14Z olh $
+ * $Id: copy_logs_finish.ycp 29684 2006-04-04 18:07:34Z jsrain $
*
*/

@@ -60,7 +60,7 @@

InjectRenamedFile( Directory::logdir, file, sformat( "y2log-%1", target_no ) );
}
- if ( file == "zypp.log" )
+ else if ( file == "zypp.log" )
{
// Save zypp.log from the inst-sys
InjectRenamedFile( Directory::logdir, file, "zypp.log-1");
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-installation-2.13.58/src/include/add-on-workflow.ycp new/yast2-installation-2.13.59/src/include/add-on-workflow.ycp
--- old/yast2-installation-2.13.58/src/include/add-on-workflow.ycp 2006-03-29 00:40:40.000000000 +0200
+++ new/yast2-installation-2.13.59/src/include/add-on-workflow.ycp 2006-04-05 16:46:12.000000000 +0200
@@ -343,6 +343,7 @@
{
if (AddOnProduct::last_ret != `next)
{
+ y2milestone ("Deleting source %1", sources[0]:0);
Pkg::SourceDelete(sources[0]:0);
return AddOnProduct::last_ret;
}
@@ -354,6 +355,7 @@
y2milestone ("Deleting source %1", src_id);
Pkg::SourceDelete (src_id);
src_id = Pkg::SourceCreate (url, product_dir);
+ SourceManager::newSources = [src_id];
if (src_id == -1)
{
// error report
@@ -442,6 +444,7 @@
if (ret != `next)
{
foreach (integer src, SourceManager::newSources, {
+ y2milestone ("Deleting source %1", src);
Pkg::SourceDelete (src);
});
}
@@ -449,13 +452,18 @@
{
foreach (integer src, SourceManager::newSources, {
if (src != selected)
+ {
+ y2milestone ("Deleting source %1", src);
Pkg::SourceDelete (src);
+ }
});
map data = Pkg::SourceGeneralData (selected);
string url = data["url"]:"";
string product_dir = data["product_dir"]:"";
+ y2milestone ("Deleting source %1", selected);
Pkg::SourceDelete (selected);
selected = Pkg::SourceCreate (url, product_dir);
+ SourceManager::newSources = [selected];
if (selected == -1)
{
// error report
@@ -471,12 +479,12 @@
}

symbol ProductSelect () {
- list<map<string,any> > products = Pkg::ResolvableProperties ("", `product, "");
- list<map<string,any> > installed_products = filter (map<string,any> p, products, {
+ list<map<string,any> > all_products = Pkg::ResolvableProperties ("", `product, "");
+ list<map<string,any> > installed_products = filter (map<string,any> p, all_products, {
return p["status"]:nil == `selected || p["status"]:nil == `installed;
});
y2milestone ("Already installed/selected products: %1", installed_products);
- products = filter (map<string,any> p, products, {
+ list<map<string,any> > products = filter (map<string,any> p, all_products, {
return p["source"]:-1 == AddOnProduct::src_id;
});
y2milestone ("Products on the media: %1", products);
@@ -528,8 +536,9 @@
// message popup
Popup::Message (_("The product on the media is already installed
or selected for installation."));
- AddOnProduct::last_ret = `back;
- return `back;
+ y2milestone ("Deleting installatino source %1", AddOnProduct::src_id);
+ Pkg::SourceDelete (AddOnProduct::src_id);
+ return `finish;
}
// Display /media.1/info.txt if such file exists
// Display license and wait for agreement
@@ -544,7 +553,6 @@
{
y2milestone ("Only one product available - skipping dialog");
map<string,any> prod = products[0]:$[];
- Pkg::ResolvableInstall (prod["name"]:"", `product);
if (! AddOnProduct::CheckProductDependencies ([prod["name"]:""]))
{
Pkg::ResolvableRemove (prod["name"]:"", `product);
@@ -553,6 +561,24 @@
AddOnProduct::last_ret = `back;
return `back;
}
+ // check whether the product is already available on some media - it is similar as below
+ integer found_source = -1;
+ foreach (map<string,any> p, all_products, {
+ if (p["name"]:"" == prod["name"]:"" && p["version"]:"" == prod["version"]:""
+ && p["media"]:-2 != prod["media"]:-3)
+ {
+ y2milestone ("Product %1 already available on media %2", p, p["media"]:-1);
+ found_source = p["media"]:-1;
+ break;
+ }
+ });
+ if (found_source != -1)
+ {
+ y2milestone ("Deleting source %1", AddOnProduct::src_id);
+ Pkg::SourceDelete (AddOnProduct::src_id);
+ AddOnProduct::src_id = found_source;
+ }
+ Pkg::ResolvableInstall (prod["name"]:"", `product);
map data = Pkg::SourceGeneralData (AddOnProduct::src_id);
string url = data["url"]:"";
string product_dir = data["product_dir"]:"";
@@ -605,6 +631,31 @@
if (ret == `next)
{
list<string> selected = (list<string>)UI::QueryWidget (`id (`products), `SelectedItems);
+ // check whether the product is already available on some media - it is similar as above
+ list<map<string,any> > prods = filter (map<string,any> p, products, {
+ return contains (selected, p["name"]:"");
+ });
+ boolean all_found = true;
+ map<string,integer> prod2src = $[];
+ foreach (map<string,any> prod, prods, {
+ boolean product_found = false;
+ foreach (map<string,any> p, all_products, {
+ if (p["name"]:"" == prod["name"]:"" && p["version"]:"" == prod["version"]:""
+ && p["media"]:-2 != prod["media"]:-3)
+ {
+ product_found = true;
+ prod2src[prod["name"]:""] = p["media"]:-3;
+ break;
+ }
+ });
+ all_found = all_found && product_found;
+ });
+ if (all_found)
+ {
+ y2milestone ("Deleting source %1", AddOnProduct::src_id);
+ Pkg::SourceDelete (AddOnProduct::src_id);
+ AddOnProduct::src_id = -1;
+ }
foreach (string product, selected, {
Pkg::ResolvableInstall (product, `product);
});
@@ -623,7 +674,9 @@
string product_dir = data["product_dir"]:"";
foreach (string product, selected, {
AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[
- "media" : AddOnProduct::src_id,
+ "media" : AddOnProduct::src_id == -1
+ ? prod2src[product]:-1
+ : AddOnProduct::src_id,
"product" : product,
"media_url" : url,
"product_dir" : product_dir,
@@ -637,7 +690,10 @@
}

if (ret == `abort)
+ {
+ y2milestone ("Deleting source %1", AddOnProduct::src_id);
Pkg::SourceDelete (AddOnProduct::src_id);
+ }

AddOnProduct::last_ret = ret;
return ret;
@@ -737,7 +793,10 @@
return prod["media"]:-1 == media;
}));
if (med_count == 1)
+ {
+ y2milestone ("Deleting source %1", media);
Pkg::SourceDelete (media);
+ }
// remove the selected record
AddOnProduct::add_on_products[selected] = nil;
AddOnProduct::add_on_products = filter (map<string,any> prod,


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



Remember to have fun...


< Previous Next >