Hello community,
here is the log from the commit of package yast2-packager
checked in at Thu Nov 20 01:58:11 CET 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-11-18 00:13:27.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-11-19 15:17:16.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Nov 19 15:15:03 CET 2008 - locilka@suse.cz
+
+- Fixed reseting the software proposal. There are two possible
+ resets now: PkgReset (full) and PkgApplReset (keeps user-made
+ selection) (bnc #446406).
+- 2.17.44
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.17.43.tar.bz2
New:
----
yast2-packager-2.17.44.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.j12795/_old 2008-11-20 01:57:44.000000000 +0100
+++ /var/tmp/diff_new_pack.j12795/_new 2008-11-20 01:57:44.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.17.43)
+# spec file for package yast2-packager (Version 2.17.44)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-packager
-Version: 2.17.43
+Version: 2.17.44
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.17.43.tar.bz2
+Source0: yast2-packager-2.17.44.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
# HTTP.ycp
@@ -78,7 +78,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.17.43
+%setup -n yast2-packager-2.17.44
%build
%{prefix}/bin/y2tool y2autoconf
@@ -113,8 +113,12 @@
/usr/share/YaST2/scrconf/*
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
-
%changelog
+* Wed Nov 19 2008 locilka@suse.cz
+- Fixed reseting the software proposal. There are two possible
+ resets now: PkgReset (full) and PkgApplReset (keeps user-made
+ selection) (bnc #446406).
+- 2.17.44
* Fri Nov 14 2008 lslezak@suse.cz
- changed SW selection is not an error (bnc#444517)
- 2.17.43
++++++ yast2-packager-2.17.43.tar.bz2 -> yast2-packager-2.17.44.tar.bz2 ++++++
++++ 3250 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.17.43/configure.in new/yast2-packager-2.17.44/configure.in
--- old/yast2-packager-2.17.43/configure.in 2008-11-14 16:45:51.000000000 +0100
+++ new/yast2-packager-2.17.44/configure.in 2008-10-09 19:19:24.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.17.43, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.17.27, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.43"
+VERSION="2.17.27"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
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.17.43/src/modules/Packages.ycp new/yast2-packager-2.17.44/src/modules/Packages.ycp
--- old/yast2-packager-2.17.43/src/modules/Packages.ycp 2008-11-14 16:45:47.000000000 +0100
+++ new/yast2-packager-2.17.44/src/modules/Packages.ycp 2008-11-19 15:17:32.000000000 +0100
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 53330 2008-11-14 15:42:26Z lslezak $
+ * $Id: Packages.ycp 53424 2008-11-19 14:18:12Z locilka $
*/
{
@@ -564,7 +564,10 @@
]);
});
});
- Pkg::PkgReset();
+
+ // This reset keep user-made changes
+ // BNC #446406
+ Pkg::PkgApplReset();
foreach (map res, restore, {
Pkg::ResolvableInstall (res["name"]:"", (symbol)(res["type"]:nil));
});
@@ -720,11 +723,12 @@
packages = add (packages, "xinetd");
}
+ //this means we have a remote X server
if (Linuxrc::display_ip ())
{
packages = add (packages, "yast2-qt");
packages = add (packages, "xorg-x11");
- packages = add (packages, "fvwm2");
+ packages = add (packages, "icewm");
packages = add (packages, "sax2-tools");
}
@@ -1608,8 +1612,10 @@
/**
* Make a proposal for package selection
- * @param force reset
- * @param re-initialize
+ *
+ * @param force reset (fully resets the proposal and creates a new one)
+ * @param re-initialize (soft-reset, doesn't reset resolbavle manually selected by user)
+ *
* @return map for the API proposal
*/
global map Proposal (boolean force_reset, boolean reinit, boolean simple) {
@@ -1623,18 +1629,23 @@
if (new_packages_proposal != old_packages_proposal) {
y2milestone ("PackagesProposal have changed");
old_packages_proposal = new_packages_proposal;
- force_reset = true;
+ reinit = true;
}
- // Reinit forced by application
+ // Reinit forced by application, see ForceFullRepropose
if (full_repropose == true) {
- y2milestone ("Forcing reset");
+ y2milestone ("Fully reproposing");
force_reset = true;
full_repropose = false;
}
if (force_reset) {
+ y2milestone ("Forcing full reset");
+ // Full reset has been forced, bnc #446406
+ // It resets even the user-selected/removed resolvables
+ Pkg::PkgReset();
ResetProposalCache();
+ reinit = true;
}
// if the cache is valid and reset or reinitialization is not required
@@ -1695,8 +1706,10 @@
y2milestone ("Packages::Proposal: force_reset %1, reinit %2, lang '%3'",
force_reset, reinit, Language::language);
- if ( !Mode::autoinst() && force_reset )
+ // Soft proposal reset
+ if ( !Mode::autoinst() && reinit )
{
+ y2milestone ("Re/Proposing software selection");
Kernel::ProbeKernel();
Packages::Reset ([`product]);
reinit = true;
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.17.43/VERSION new/yast2-packager-2.17.44/VERSION
--- old/yast2-packager-2.17.43/VERSION 2008-11-14 16:45:02.000000000 +0100
+++ new/yast2-packager-2.17.44/VERSION 2008-11-19 15:17:24.000000000 +0100
@@ -1 +1 @@
-2.17.43
+2.17.44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org