Mailinglist Archive: opensuse-commit (817 mails)

< Previous Next >
commit yast2-online-update for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 05 Dec 2008 16:04:26 +0100
  • Message-id: <20081205150426.B884F67816B@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-online-update for
openSUSE:Factory
checked in at Fri Dec 5 16:04:26 CET 2008.


--------
--- yast2-online-update/yast2-online-update.changes 2008-10-30
13:51:20.000000000 +0100
+++
/mounts/work_src_done/STABLE/yast2-online-update/yast2-online-update.changes
2008-12-05 15:57:09.923013000 +0100
@@ -1,0 +2,7 @@
+Fri Dec 5 15:47:52 CET 2008 - jsuchome@xxxxxxx
+
+- when there are patches for package management available, tell
+ solver to not bring recommended packages (bnc#450528)
+- 2.17.11
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
yast2-online-update-2.17.10.tar.bz2

New:
----
yast2-online-update-2.17.11.tar.bz2

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

Other differences:
------------------
++++++ yast2-online-update.spec ++++++
--- /var/tmp/diff_new_pack.bf4899/_old 2008-12-05 16:04:19.000000000 +0100
+++ /var/tmp/diff_new_pack.bf4899/_new 2008-12-05 16:04:19.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-online-update (Version 2.17.10)
+# spec file for package yast2-online-update (Version 2.17.11)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,17 +19,17 @@


Name: yast2-online-update
-Version: 2.17.10
+Version: 2.17.11
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-online-update-2.17.10.tar.bz2
+Source0: yast2-online-update-2.17.11.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config
update-desktop-files yast2-bootloader yast2-devtools yast2-packager
PreReq: grep sed
-# new registration of callbacks
-Requires: yast2-pkg-bindings >= 2.16.23
+# Pkg::GetSolverFlags, Pkg::SetSolverFlags
+Requires: yast2-pkg-bindings >= 2.17.31
# PackagesUI::RunPackageSelector
Requires: yast2 >= 2.17.40
# PackageCallbacks::FormatPatchName
@@ -59,7 +59,7 @@
Jiri Suchomel <jsuchome@xxxxxxx>

%prep
-%setup -n yast2-online-update-2.17.10
+%setup -n yast2-online-update-2.17.11

%build
%{prefix}/bin/y2tool y2autoconf
@@ -115,6 +115,10 @@
%defattr(-,root,root)
%{prefix}/share/applications/YaST2/online_update.desktop
%changelog
+* Fri Dec 05 2008 jsuchome@xxxxxxx
+- when there are patches for package management available, tell
+ solver to not bring recommended packages (bnc#450528)
+- 2.17.11
* Thu Oct 30 2008 locilka@xxxxxxx
- Fixed 'Conflicts with yast2-wagon' (bnc #439934).
- 2.17.10
@@ -364,7 +368,7 @@
* Tue Apr 25 2006 jsuchome@xxxxxxx
- 'Patch CD Update': save CD source at the end
- 2.13.33
-* Tue Apr 25 2006 jsrain@xxxxxxx
+* Mon Apr 24 2006 jsrain@xxxxxxx
- removed SortKey from online_update_setup.desktop (#168768)
- 2.13.32
* Fri Apr 21 2006 jsuchome@xxxxxxx
@@ -590,7 +594,7 @@
- Moved patch download and installation logic from YCP code
to packagemanager.
- 2.9.4
-* Sun Feb 08 2004 arvin@xxxxxxx
+* Sat Feb 07 2004 arvin@xxxxxxx
- removed config files (*.y2cc)
* Wed Feb 04 2004 cschum@xxxxxxx
- Split off you_server to own package.

++++++ yast2-online-update-2.17.10.tar.bz2 ->
yast2-online-update-2.17.11.tar.bz2 ++++++
++++ 60314 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-online-update-2.17.10/config.h.in
new/yast2-online-update-2.17.11/config.h.in
--- old/yast2-online-update-2.17.10/config.h.in 2008-10-27 17:12:38.000000000
+0100
+++ new/yast2-online-update-2.17.11/config.h.in 2008-07-08 13:31:22.000000000
+0200
@@ -45,10 +45,6 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H

-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#undef LT_OBJDIR
-
/* Name of package */
#undef PACKAGE

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-online-update-2.17.10/configure.in
new/yast2-online-update-2.17.11/configure.in
--- old/yast2-online-update-2.17.10/configure.in 2008-10-27
17:12:29.000000000 +0100
+++ new/yast2-online-update-2.17.11/configure.in 2008-07-08
13:31:04.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-online-update
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-online-update, 2.17.9, http://bugs.opensuse.org/,
yast2-online-update)
+AC_INIT(yast2-online-update, 2.17.3, http://bugs.opensuse.org/,
yast2-online-update)
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.9"
+VERSION="2.17.3"
RPMNAME="yast2-online-update"
MAINTAINER="Jiri Suchomel <jsuchome@xxxxxxx>"

@@ -145,14 +145,8 @@
AC_PROG_CC
AC_PROG_CPP

-# If we have core, get its Y2CORE_CFLAGS.
-# When building core itself, it has set Y2CORE_CFLAGS elsewhere already
-PKG_CHECK_EXISTS([yast2-core],[
- PKG_CHECK_MODULES(Y2CORE, yast2-core)
-])
-
-CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
+CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"

: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
AC_SUBST(AGENT_LIBADD)
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-online-update-2.17.10/src/inst_you.ycp
new/yast2-online-update-2.17.11/src/inst_you.ycp
--- old/yast2-online-update-2.17.10/src/inst_you.ycp 2008-10-22
15:26:16.000000000 +0200
+++ new/yast2-online-update-2.17.11/src/inst_you.ycp 2008-12-05
15:47:37.000000000 +0100
@@ -130,7 +130,15 @@
SCR::Execute (.target.remove, saved_path);
}

- boolean solved = Pkg::PkgSolve (false);
+ Pkg::PkgApplReset (); // ensure there are no transactions set accidentally
+ // save solver flags
+ map solver_flags_backup = Pkg::GetSolverFlags ();
+ // ignore reccomends when we weant only pkg management patches
+ Pkg::SetSolverFlags ($[
+ "ignoreAlreadyRecommended" : true,
+ "onlyRequires" : true
+ ]);
+ boolean solved = Pkg::PkgSolve (true);

// select the patches affecting pkg management
selected = Pkg::ResolvablePreselectPatches (`affects_pkg_manager);
@@ -139,6 +147,10 @@
// if no patch is selected, pre-select all security and recommended
if (selected < 1)
{
+ // restore the original solver settings - enable recommends
+ Pkg::SetSolverFlags (solver_flags_backup);
+ // new solver run required to include recommends
+ Pkg::PkgSolve (true);
selected = Pkg::ResolvablePreselectPatches (`all);
y2milestone ("All preselected patches: %1", selected);
}
@@ -156,6 +168,7 @@
if (ret_sel == `cancel)
{
y2milestone ("package selector canceled -> `next");
+ Pkg::SetSolverFlags (solver_flags_backup);
return `next;
}
if (ret_sel == `accept)
@@ -230,6 +243,7 @@
!Pkg::PkgAnyToDelete ())
{
y2milestone ("no patch selected after all -> `next");
+ Pkg::SetSolverFlags (solver_flags_backup);
return `next;
}
}
@@ -268,6 +282,7 @@
if (ret_sel == `cancel)
{
y2milestone ("package selector canceled -> `next");
+ Pkg::SetSolverFlags (solver_flags_backup);
return `next;
}
}
@@ -299,5 +314,6 @@
}
}
y2milestone ("result of inst_you: %1", ret);
+ Pkg::SetSolverFlags (solver_flags_backup);
return ret;
}
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-online-update-2.17.10/src/online_update_select.ycp
new/yast2-online-update-2.17.11/src/online_update_select.ycp
--- old/yast2-online-update-2.17.10/src/online_update_select.ycp
2008-10-22 15:26:16.000000000 +0200
+++ new/yast2-online-update-2.17.11/src/online_update_select.ycp
2008-12-05 15:47:37.000000000 +0100
@@ -66,7 +66,14 @@
SCR::Execute (.target.remove, saved_path);
}

- Pkg::PkgSolve(true);
+ Pkg::PkgApplReset (); // ensure there are no transactions set accidentally
+ map solver_flags_backup = Pkg::GetSolverFlags ();
+ // ignore reccomends when we weant only pkg management patches
+ Pkg::SetSolverFlags ($[
+ "ignoreAlreadyRecommended" : true,
+ "onlyRequires" : true
+ ]);
+ Pkg::PkgSolve (true);

// 1st, select the patches affecting pkg management
selected = Pkg::ResolvablePreselectPatches (`affects_pkg_manager);
@@ -75,6 +82,11 @@
// if no patch is selected, pre-select all security and recommended
if (selected < 1)
{
+ // restore the original solver settings - enable recommends
+ Pkg::SetSolverFlags (solver_flags_backup);
+ // new solver run required to include recommends
+ Pkg::PkgSolve (true);
+
selected = Pkg::ResolvablePreselectPatches (`all);
y2milestone ("All preselected patches: %1", selected);
}
@@ -146,12 +158,17 @@
Wizard::ClearContents();

y2milestone ("RunPkgSelection finally returned '%1'", ret);
+
+ // restore the original solver settings, just to be sure...
+ Pkg::SetSolverFlags (solver_flags_backup);
+
if ( ret == `cancel ) return `abort;

boolean more_patches_needed = false;
foreach (map patch, Pkg::ResolvableProperties("", `patch, ""), {
if (patch["status"]:`none == `selected)
{
+ y2milestone ("selected patch: %1", patch);
if (patch["reboot_needed"]:false)
reboot_needed = true;
if (patch["relogin_needed"]:false)
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-online-update-2.17.10/VERSION new/yast2-online-update-2.17.11/VERSION
--- old/yast2-online-update-2.17.10/VERSION 2008-10-30 13:50:38.000000000
+0100
+++ new/yast2-online-update-2.17.11/VERSION 2008-12-05 15:49:30.000000000
+0100
@@ -1 +1 @@
-2.17.10
+2.17.11


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



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread