Mailinglist Archive: opensuse-commit (1206 mails)
| < Previous | Next > |
commit yast2-packager
- From: root@xxxxxxx (h_root)
- Date: Tue, 9 May 2006 19:15:25 +0200 (CEST)
- Message-id: <20060509171525.093E98C62E@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-packager
checked in at Tue May 9 19:15:25 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-05-09 09:25:40.000000000 +0200
+++ STABLE/yast2-packager/yast2-packager.changes 2006-05-09 15:37:05.000000000 +0200
@@ -1,0 +2,7 @@
+Tue May 9 15:32:18 CEST 2006 - jsrain@xxxxxxx
+
+- properly select newer version of packages if service pack is
+ added (#172271)
+- 2.13.110
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.109.tar.bz2
New:
----
yast2-packager-2.13.110.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.PQEczC/_old 2006-05-09 19:15:20.000000000 +0200
+++ /var/tmp/diff_new_pack.PQEczC/_new 2006-05-09 19:15:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.109)
+# spec file for package yast2-packager (Version 2.13.110)
#
# 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.109
+Version: 2.13.110
Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.109.tar.bz2
+Source0: yast2-packager-2.13.110.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.109
+%setup -n yast2-packager-2.13.110
%build
%{prefix}/bin/y2tool y2autoconf
@@ -79,6 +79,10 @@
%changelog -n yast2-packager
* Tue May 09 2006 - jsrain@xxxxxxx
+- properly select newer version of packages if service pack is
+ added (#172271)
+- 2.13.110
+* Tue May 09 2006 - jsrain@xxxxxxx
- preselect relevant packages for X11 installation (#168056)
- 2.13.109
* Thu May 04 2006 - locilka@xxxxxxx
++++++ yast2-packager-2.13.109.tar.bz2 -> yast2-packager-2.13.110.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.109/VERSION new/yast2-packager-2.13.110/VERSION
--- old/yast2-packager-2.13.109/VERSION 2006-05-09 09:24:07.000000000 +0200
+++ new/yast2-packager-2.13.110/VERSION 2006-05-09 15:35:49.000000000 +0200
@@ -1 +1 @@
-2.13.109
+2.13.110
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.109/configure new/yast2-packager-2.13.110/configure
--- old/yast2-packager-2.13.109/configure 2006-05-09 09:25:15.000000000 +0200
+++ new/yast2-packager-2.13.110/configure 2006-05-09 15:36:25.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.109.
+# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.110.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.13.109'
-PACKAGE_STRING='yast2-packager 2.13.109'
+PACKAGE_VERSION='2.13.110'
+PACKAGE_STRING='yast2-packager 2.13.110'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-packager 2.13.109 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.13.110 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.13.109:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.13.110:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.13.109
+yast2-packager configure 2.13.110
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-packager $as_me 2.13.109, which was
+It was created by yast2-packager $as_me 2.13.110, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.13.109'
+ VERSION='2.13.110'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.109"
+VERSION="2.13.110"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"
@@ -2695,7 +2695,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-packager $as_me 2.13.109, which was
+This file was extended by yast2-packager $as_me 2.13.110, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2750,7 +2750,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.13.109
+yast2-packager config.status 2.13.110
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.109/configure.in new/yast2-packager-2.13.110/configure.in
--- old/yast2-packager-2.13.109/configure.in 2006-05-09 09:25:11.000000000 +0200
+++ new/yast2-packager-2.13.110/configure.in 2006-05-09 15:36:17.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.109, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.13.110, http://bugs.opensuse.org/, 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.109"
+VERSION="2.13.110"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.109/src/modules/Packages.ycp new/yast2-packager-2.13.110/src/modules/Packages.ycp
--- old/yast2-packager-2.13.109/src/modules/Packages.ycp 2006-05-09 09:22:57.000000000 +0200
+++ new/yast2-packager-2.13.110/src/modules/Packages.ycp 2006-05-09 15:32:56.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif <nashif@xxxxxxx>
*
- * $Id: Packages.ycp 30743 2006-05-09 07:22:54Z jsrain $
+ * $Id: Packages.ycp 30764 2006-05-09 13:32:51Z jsrain $
*/
{
@@ -900,24 +900,58 @@
y2milestone ("No base selection found, but patterns found...");
redo_proposal = (initial_run && !Mode::autoinst ()) || ! system_packages_selected;
using_patterns = true;
+ list<string> system_packages = ComputeSystemPackageList();
if (initial_run || ! system_packages_selected)
{
- y2milestone ("Selecting system packages");
- map <string, any> res = Pkg::DoProvide (ComputeSystemPackageList());
- if (size (res) > 0)
- {
- foreach (string s, any a, res, {
- y2warning ("Pkg::DoProvide failed for %1: %2", s, a);
+ y2milestone ("Selecting system packages %1", system_packages);
+ }
+ else
+ {
+ y2milestone ("Re-selecting new versions of system packages %1", system_packages);
+ // first deselect the package (and filter selected ones)
+ system_packages = filter (string p, system_packages, {
+ if (Pkg::IsProvided (p) || Pkg::IsSelected (p))
+ {
+ Pkg::PkgDelete (p);
+ return true;
+ }
+ return false;
+ });
+ y2milestone ("System packages to be reselected: %1", system_packages);
+ }
+ map <string, any> res = Pkg::DoProvide (system_packages);
+ if (size (res) > 0)
+ {
+ foreach (string s, any a, res, {
+ y2warning ("Pkg::DoProvide failed for %1: %2", s, a);
+ });
+ }
+ list<string> system_patterns = ComputeSystemPatternList ();
+ if (initial_run || ! system_packages_selected)
+ {
+ y2milestone ("Selecting system patterns %1", system_patterns);
+ foreach (string p, system_patterns, {
+ Pkg::ResolvableInstall (p, `pattern);
+ });
+ }
+ else
+ {
+ y2milestone ("Re-selecting system patterns %1", system_patterns);
+ list<string>pats = filter (string p, system_patterns, {
+ list<map<string,any> > descrs = Pkg::ResolvableProperties (p, `pattern, "");
+ descrs = filter (map<string,any> descr, descrs, {
+ return descr["status"]:nil == `selected;
});
- }
- y2milestone ("Selecting system patterns");
- list<string> pats = ComputeSystemPatternList ();
+ return size (descrs) > 0;
+ });
+ y2milestone ("Selected patterns to be reselected: %1", pats);
foreach (string p, pats, {
+ Pkg::ResolvableRemove (p, `pattern);
Pkg::ResolvableInstall (p, `pattern);
});
- Pkg::PkgFreshen();
- system_packages_selected = true;
}
+ system_packages_selected = true;
+ Pkg::PkgFreshen();
}
else if (ProductFeatures::GetFeature ("software","selection_type") == `fixed)
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
| < Previous | Next > |