Hello community,
here is the log from the commit of package zypper for openSUSE:Factory
checked in at Mon Mar 1 01:52:44 CET 2010.
--------
--- zypper/zypper.changes 2010-02-22 17:24:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2010-02-26 15:06:10.000000000 +0100
@@ -1,0 +2,22 @@
+Thu Feb 25 22:18:48 CET 2010 - jkupec@suse.cz
+
+- Added a few forgotten strings for translation (bnc #581332)
+
+-------------------------------------------------------------------
+Thu Feb 25 11:57:48 CET 2010 - ma@suse.de
+
+- Fix SEGV in Summary::writeResolvableList
+- 1.2.20
+
+-------------------------------------------------------------------
+Tue Feb 23 18:01:48 CET 2010 - jkupec@suse.cz
+
+- Avoid a newline in 'zypper --quiet list-patches' (bnc #523573)
+
+-------------------------------------------------------------------
+Tue Feb 23 14:17:20 CET 2010 - jkupec@suse.cz
+
+- Showing packages that need additional customer contract
+ separately in the installation summary (bnc #581926 c#6)
+
+-------------------------------------------------------------------
@@ -5,0 +28 @@
+- 1.2.19
calling whatdependson for head-i586
Old:
----
zypper-1.2.19.tar.bz2
New:
----
zypper-1.2.21.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zypper.spec ++++++
--- /var/tmp/diff_new_pack.1cLZKm/_old 2010-03-01 01:52:37.000000000 +0100
+++ /var/tmp/diff_new_pack.1cLZKm/_new 2010-03-01 01:52:37.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package zypper (Version 1.2.19)
+# spec file for package zypper (Version 1.2.21)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,15 +23,17 @@
BuildRequires: augeas-devel >= 0.5.0 readline-devel >= 5.1
BuildRequires: cmake >= 2.4.6 gcc-c++ >= 4.1
Requires: procps
+%if 0%{?suse_version}
%requires_ge libzypp
Recommends: logrotate cron
+PreReq: permissions
+%endif
License: GPLv2+
Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on
-PreReq: permissions
Summary: Command line software manager using libzypp
-Version: 1.2.19
+Version: 1.2.21
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
@@ -95,14 +97,14 @@
%{__install} -d -m755 %buildroot%_var/log
touch %buildroot%_var/log/zypper.log
+%if 0%{?suse_version}
+
%post
-/sbin/ldconfig
%run_permissions
%verifyscript
%verify_permissions -e %{_sbindir}/zypp-refresh-wrapper
-
-%postun -p /sbin/ldconfig
+%endif
%clean
++++++ zypper-1.2.19.tar.bz2 -> zypper-1.2.21.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/.gitignore new/zypper-1.2.21/.gitignore
--- old/zypper-1.2.19/.gitignore 2010-02-22 17:23:33.000000000 +0100
+++ new/zypper-1.2.21/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-.*
-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/VERSION.cmake new/zypper-1.2.21/VERSION.cmake
--- old/zypper-1.2.19/VERSION.cmake 2010-02-22 17:23:33.000000000 +0100
+++ new/zypper-1.2.21/VERSION.cmake 2010-02-26 15:05:20.000000000 +0100
@@ -31,7 +31,7 @@
#
SET(VERSION_MAJOR "1")
SET(VERSION_MINOR "2")
-SET(VERSION_PATCH "19")
+SET(VERSION_PATCH "21")
-# LAST RELEASED: 1.2.19
+# LAST RELEASED: 1.2.20
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/package/zypper.changes new/zypper-1.2.21/package/zypper.changes
--- old/zypper-1.2.19/package/zypper.changes 2010-02-22 17:23:33.000000000 +0100
+++ new/zypper-1.2.21/package/zypper.changes 2010-02-26 15:05:20.000000000 +0100
@@ -1,8 +1,31 @@
-------------------------------------------------------------------
+Thu Feb 25 22:18:48 CET 2010 - jkupec@suse.cz
+
+- Added a few forgotten strings for translation (bnc #581332)
+
+-------------------------------------------------------------------
+Thu Feb 25 11:57:48 CET 2010 - ma@suse.de
+
+- Fix SEGV in Summary::writeResolvableList
+- 1.2.20
+
+-------------------------------------------------------------------
+Tue Feb 23 18:01:48 CET 2010 - jkupec@suse.cz
+
+- Avoid a newline in 'zypper --quiet list-patches' (bnc #523573)
+
+-------------------------------------------------------------------
+Tue Feb 23 14:17:20 CET 2010 - jkupec@suse.cz
+
+- Showing packages that need additional customer contract
+ separately in the installation summary (bnc #581926 c#6)
+
+-------------------------------------------------------------------
Mon Feb 22 17:22:14 CET 2010 - jkupec@suse.cz
- Avoiding confirmation of unchanged license on upgrade
(bnc #394396)
+- 1.2.19
-------------------------------------------------------------------
Sun Feb 21 14:17:39 CET 2010 - jkupec@suse.cz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/src/Summary.cc new/zypper-1.2.21/src/Summary.cc
--- old/zypper-1.2.19/src/Summary.cc 2010-02-22 17:23:33.000000000 +0100
+++ new/zypper-1.2.21/src/Summary.cc 2010-02-26 15:05:19.000000000 +0100
@@ -140,12 +140,12 @@
{
ResObject::constPtr res(*resit);
- // FIXME asKind not working?
Package::constPtr pkg = asKind<Package>(res);
if (pkg)
{
- // FIXME refactor with libzypp Package::vendorSupportAvailable()
- if (pkg->maybeUnsupported())
+ if (pkg->vendorSupport() & VendorSupportACC)
+ support_needacc[res->kind()].insert(ResPair(nullres, res));
+ else if (pkg->maybeUnsupported())
unsupported[res->kind()].insert(ResPair(nullres, res));
}
@@ -272,10 +272,13 @@
for_(resit, resolvables.begin(), resolvables.end())
dupes[resit->second->name()]++;
// remove the single-versions from the map
- map::iterator it = dupes.begin();
- for (; it != dupes.end(); ++it)
+ for (map::iterator it = dupes.begin(); it != dupes.end(); /**/)
+ {
if (it->second == 1)
- dupes.erase(it); // seems the iterator is not invalidated by this
+ dupes.erase(it++); // postfix! Incrementing before erase
+ else
+ ++it;
+ }
}
if ((_viewop & DETAILS) == 0)
@@ -820,7 +823,7 @@
for_(it, unsupported.begin(), unsupported.end())
{
string label;
- // we only look vendor support in packages
+ // we only look at vendor support in packages
if (it->first == ResKind::package)
label = _PL(
"The following package is not supported by its vendor:",
@@ -834,6 +837,25 @@
// --------------------------------------------------------------------------
+void Summary::writeNeedACC(ostream & out)
+{
+ for_(it, support_needacc.begin(), support_needacc.end())
+ {
+ string label;
+ // we only look at vendor support in packages
+ if (it->first == ResKind::package)
+ label = _PL(
+ "The following package needs additional customer contract to get support:",
+ "The following packages need additional customer contract to get support:",
+ it->second.size());
+ out << endl << label << endl;
+
+ writeResolvableList(out, it->second);
+ }
+}
+
+// --------------------------------------------------------------------------
+
void Summary::writeDownloadAndInstalledSizeSummary(ostream & out)
{
if (!_inst_pkg_total && toremove.empty())
@@ -1005,7 +1027,10 @@
writeChangedArch(out);
writeChangedVendor(out);
if (_viewop & SHOW_UNSUPPORTED)
+ {
+ writeNeedACC(out);
writeUnsupported(out);
+ }
out << endl;
writePackageCounts(out);
writeDownloadAndInstalledSizeSummary(out);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/src/Summary.h new/zypper-1.2.21/src/Summary.h
--- old/zypper-1.2.19/src/Summary.h 2010-02-22 17:23:33.000000000 +0100
+++ new/zypper-1.2.21/src/Summary.h 2010-02-26 15:05:19.000000000 +0100
@@ -78,6 +78,7 @@
void writeChangedArch(std::ostream & out);
void writeChangedVendor(std::ostream & out);
void writeUnsupported(std::ostream & out);
+ void writeNeedACC(std::ostream & out);
void writePackageCounts(std::ostream & out);
void writeDownloadAndInstalledSizeSummary(std::ostream & out);
@@ -132,8 +133,10 @@
KindToResPairSet toremove;
KindToResPairSet tochangearch;
KindToResPairSet tochangevendor;
- /** objects from previous lists that are not supported */
+ /** objects from previous lists that are marked as not supported */
KindToResPairSet unsupported;
+ /** objects from previous lists that need additional customer contract */
+ KindToResPairSet support_needacc;
/** \name For weak deps info.
* @{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/src/callbacks/locks.h new/zypper-1.2.21/src/callbacks/locks.h
--- old/zypper-1.2.19/src/callbacks/locks.h 2010-02-22 17:23:33.000000000 +0100
+++ new/zypper-1.2.21/src/callbacks/locks.h 2010-02-26 15:05:19.000000000 +0100
@@ -8,14 +8,13 @@
#ifndef LOCKS_ZYPPER_CALLBACKS_H
#define LOCKS_ZYPPER_CALLBACKS_H
-#include <iostream>
+#include <iosfwd>
#include "zypp/base/Logger.h"
#include "zypp/ZYppCallbacks.h"
#include "zypp/PoolQuery.h"
#include "utils/prompt.h"
-//#include "utils/misc.h"
namespace zypp {
@@ -24,14 +23,17 @@
virtual Action conflict( const PoolQuery& query, ConflictState state )
{
if (state == SAME_RESULTS)
- Zypper::instance()->out().error("The following query locks the same packages as the lock which you want remove:");
+ Zypper::instance()->out().error(
+ _("The following query locks the same objects as the one you want to remove:"));
else
- Zypper::instance()->out().error(_("The following query locks some of the objects you want to unlock:"));
+ Zypper::instance()->out().error(
+ _("The following query locks some of the objects you want to unlock:"));
query.serialize(std::cout);
- return read_bool_answer(PROMPT_YN_REMOVE_LOCK ,
- "Do you want remove this lock?", true)? DELETE : IGNORE;
+ return read_bool_answer(
+ PROMPT_YN_REMOVE_LOCK, _("Do you want to remove this lock?"), true) ?
+ DELETE : IGNORE;
}
};
@@ -39,12 +41,14 @@
{
virtual Action execute( const PoolQuery& query )
{
- Zypper::instance()->out().error(_("The following query does not lock anything:"));
+ Zypper::instance()->out().error(
+ _("The following query does not lock anything:"));
query.serialize(std::cout);
- return read_bool_answer(PROMPT_YN_REMOVE_LOCK ,
- "Do you want remove this lock?", true)? DELETE : IGNORE;
+ return read_bool_answer(
+ PROMPT_YN_REMOVE_LOCK, _("Do you want to remove this lock?"), true) ?
+ DELETE : IGNORE;
}
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/src/update.cc new/zypper-1.2.21/src/update.cc
--- old/zypper-1.2.19/src/update.cc 2010-02-22 17:23:33.000000000 +0100
+++ new/zypper-1.2.21/src/update.cc 2010-02-26 15:05:19.000000000 +0100
@@ -231,7 +231,7 @@
if (!tbl.empty())
{
zypper.out().info(_("The following software management updates will be installed first:"));
- cout << endl;
+ zypper.out().info("", Out::NORMAL, Out::TYPE_NORMAL);
}
pm_tbl.sort(1); // Name
cout << pm_tbl;
@@ -244,10 +244,10 @@
{
if (affectpm)
{
- cout << endl;
+ zypper.out().info("", Out::NORMAL, Out::TYPE_NORMAL);
zypper.out().info(_("The following updates are also available:"));
- cout << endl;
}
+ zypper.out().info("", Out::QUIET, Out::TYPE_NORMAL);
cout << tbl;
}
@@ -377,6 +377,8 @@
// ----------------------------------------------------------------------------
+// FIXME rewrite this function so that first the list of updates is collected and later correctly presented (bnc #523573)
+
void list_updates(Zypper & zypper, const ResKindSet & kinds, bool best_effort)
{
if (zypper.out().type() == Out::TYPE_XML)
@@ -404,8 +406,10 @@
else
{
if (kinds.size() > 1)
+ {
+ zypper.out().info("", Out::NORMAL, Out::TYPE_NORMAL);
zypper.out().info(i18n_kind_updates(*it), Out::QUIET, Out::TYPE_NORMAL);
- zypper.out().info("", Out::QUIET, Out::TYPE_NORMAL); // visual separator
+ }
affects_pkgmgr = list_patch_updates(zypper);
}
localkinds.erase(it);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/zypper.spec.cmake new/zypper-1.2.21/zypper.spec.cmake
--- old/zypper-1.2.19/zypper.spec.cmake 2010-02-22 17:23:33.000000000 +0100
+++ new/zypper-1.2.21/zypper.spec.cmake 2010-02-26 15:05:20.000000000 +0100
@@ -15,13 +15,15 @@
BuildRequires: readline-devel >= 5.1 augeas-devel >= 0.5.0
BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6
Requires: procps
+%if 0%{?suse_version}
%requires_ge libzypp
Recommends: logrotate cron
+PreReq: permissions
+%endif
License: GPL v2 or later
Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on
-PreReq: permissions
Summary: Command line software manager using libzypp
Version: @VERSION@
Release: 0
@@ -87,14 +89,13 @@
%{__install} -d -m755 %buildroot%_var/log
touch %buildroot%_var/log/zypper.log
+%if 0%{?suse_version}
%post
-/sbin/ldconfig
%run_permissions
%verifyscript
%verify_permissions -e %{_sbindir}/zypp-refresh-wrapper
-
-%postun -p /sbin/ldconfig
+%endif
%clean
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org