Hello community,
here is the log from the commit of package yast2-repair
checked in at Thu Mar 1 21:37:10 CET 2007.
--------
--- yast2-repair/yast2-repair.changes 2007-02-13 09:51:24.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-repair/yast2-repair.changes 2007-03-01 15:40:21.846153000 +0100
@@ -1,0 +2,7 @@
+Thu Mar 1 15:24:36 CET 2007 - jsuchome@suse.cz
+
+- check the products (installed vs repairing) for name and version,
+ give possibility to continue even when they differ (#195265)
+- 2.15.3
+
+-------------------------------------------------------------------
Old:
----
yast2-repair-2.15.2.tar.bz2
New:
----
yast2-repair-2.15.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-repair.spec ++++++
--- /var/tmp/diff_new_pack.Bw7482/_old 2007-03-01 21:36:37.000000000 +0100
+++ /var/tmp/diff_new_pack.Bw7482/_new 2007-03-01 21:36:37.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-repair (Version 2.15.2)
+# spec file for package yast2-repair (Version 2.15.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-repair
-Version: 2.15.2
+Version: 2.15.3
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-repair-2.15.2.tar.bz2
+Source0: yast2-repair-2.15.3.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-packager yast2-testsuite
Requires: yast2 gpart reiserfs e2fsprogs yast2-bootloader yast2-storage
@@ -34,7 +34,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-repair-2.15.2
+%setup -n yast2-repair-2.15.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -68,7 +68,11 @@
/usr/share/YaST2/include/repair/*
%doc %{prefix}/share/doc/packages/yast2-repair
-%changelog -n yast2-repair
+%changelog
+* Thu Mar 01 2007 - jsuchome@suse.cz
+- check the products (installed vs repairing) for name and version,
+ give possibility to continue even when they differ (#195265)
+- 2.15.3
* Tue Feb 13 2007 - jsuchome@suse.cz
- fixed failing testsuites (Mode::test now works correctly)
- 2.15.2
++++++ yast2-repair-2.15.2.tar.bz2 -> yast2-repair-2.15.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.15.2/src/osr_module_packages.ycp new/yast2-repair-2.15.3/src/osr_module_packages.ycp
--- old/yast2-repair-2.15.2/src/osr_module_packages.ycp 2006-12-20 14:16:59.000000000 +0100
+++ new/yast2-repair-2.15.3/src/osr_module_packages.ycp 2007-03-01 15:17:13.000000000 +0100
@@ -115,16 +115,7 @@
// error text in summary
OSRSummary::DetectError ("", _("Different versions of products"));
OSRStatus::ErrorSeverityModuleBlocking ();
- // error popup, %1 is tool name ('System repair')
- Popup::Error (sformat (_("You are using %1 from a product
-different than the installed one.
-
-Because the package database of the installed product
-can be broken, only the package database on the installation
-media can be used for package database checking.
-
-Checking the package database is not possible and will be skipped."),
- OSRCommon::tool_name));
+ return false;
}
return true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.15.2/src/OSRPkg.ycp new/yast2-repair-2.15.3/src/OSRPkg.ycp
--- old/yast2-repair-2.15.2/src/OSRPkg.ycp 2006-12-20 14:16:59.000000000 +0100
+++ new/yast2-repair-2.15.3/src/OSRPkg.ycp 2007-03-01 15:21:07.000000000 +0100
@@ -302,24 +302,43 @@
integer source_id = 1;
- // TODO we could use Packages::theSources
list curr_sources = Pkg::SourceGetCurrent (true);
source_id = curr_sources[0]:source_id;
- map source_product = Pkg::SourceProduct (source_id);
+ map source_product = Pkg::SourceProductData (source_id);
list all_products = Pkg::TargetProducts ();
map target_product = all_products[0]:$[];
y2debug ("source product: %1", source_product);
y2debug ("target_product: %1", target_product);
- if (source_product["product"]:"" != target_product["product"]:"")
+ if (source_product["productname"]:"" != target_product["name"]:"" ||
+ source_product["productversion"]:"" != target_product["version"]:"")
{
- y2error("target product (%1) is different from source product (%2)",
- target_product["product"]:"", source_product["product"]:"");
- y2warning ("source product: %1", source_product);
- y2warning ("target_product: %1", target_product);
- return false;
+ y2warning ("target product (%1-%2) is probably different from source product (%3-%4)",
+ target_product["name"]:"", target_product["version"]:"",
+ source_product["productname"]:"", source_product["productversion"]:"");
+ y2milestone ("source product: %1", source_product);
+ y2milestone ("target_product: %1", target_product);
+ // continue/cancel popup, %1 is tool name ('System repair')
+ // %2-%3 are name and version of product with yast2-repair (e.g. the one on CD/DVD)
+ // %4-%5 are name and version of installed product (the one being checked/repaired)
+ if (!Popup::ContinueCancel (sformat (_("You seem to be using %1 from
+a product (%2 %3) different
+than the installed one (%4 %5).
+
+Because the package database of the installed product
+can be damaged, only the package database from the correct
+installation media can be used for package database checking.
+Checking the package database with a different product
+should be skipped.
+
+Really continue?"),
+ OSRCommon::tool_name,
+ source_product["productname"]:"", source_product["productversion"]:"",
+ target_product["name"]:"", target_product["version"]:""))
+ )
+ return false;
}
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.15.2/VERSION new/yast2-repair-2.15.3/VERSION
--- old/yast2-repair-2.15.2/VERSION 2007-02-13 09:39:47.000000000 +0100
+++ new/yast2-repair-2.15.3/VERSION 2007-03-01 15:27:04.000000000 +0100
@@ -1 +1 @@
-2.15.2
+2.15.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org