Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at Tue Jun 9 12:29:50 CEST 2009. -------- --- zypper/zypper.changes 2009-06-05 14:10:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2009-06-08 12:38:44.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 8 11:55:57 CEST 2009 - jkupec@suse.cz + +- some code cleanup and fixes +- show arch & repo in 'products' +- 1.2.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- zypper-1.1.2.tar.bz2 New: ---- zypper-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.y22473/_old 2009-06-09 12:29:40.000000000 +0200 +++ /var/tmp/diff_new_pack.y22473/_new 2009-06-09 12:29:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package zypper (Version 1.1.2) +# spec file for package zypper (Version 1.2.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,9 +30,9 @@ AutoReqProv: on PreReq: permissions Summary: Command line software manager using libzypp -Version: 1.1.2 +Version: 1.2.0 Release: 1 -Source: zypper-1.1.2.tar.bz2 +Source: zypper-1.2.0.tar.bz2 Prefix: /usr Url: http://en.opensuse.org/Zypper Provides: y2pmsh @@ -120,6 +120,10 @@ # it from being erased by rpm -e %ghost %config(noreplace) %{_var}/log/zypper.log %changelog +* Mon Jun 08 2009 jkupec@suse.cz +- some code cleanup and fixes +- show arch & repo in 'products' +- 1.2.0 * Thu Jun 04 2009 ma@suse.de - Adapt to libzypp-6.8.0 api changes. * Fri May 22 2009 jkupec@suse.cz ++++++ zypper-1.1.2.tar.bz2 -> zypper-1.2.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.2/doc/zypper.8 new/zypper-1.2.0/doc/zypper.8 --- old/zypper-1.1.2/doc/zypper.8 2009-06-05 14:17:07.000000000 +0200 +++ new/zypper-1.2.0/doc/zypper.8 2009-06-08 12:33:56.000000000 +0200 @@ -23,6 +23,10 @@ folders called \fBrepositories\fR. Repositories can be placed on various media like an HTTP or FTP server, DVD, or a folder on a local disc. +There is a special set of commands in zypper intented to manipulate repositories. +Also many commands and options take a repository as an arugment. See section +\fBCOMMANDS\fR, subsection \fBRepository Management\fR for more details. + .SS Resource Identfiers (URI) To specify locations of repositories or other resources (RPM files, .repo files) you can use any type of URIs supported by libzypp. See @@ -781,12 +785,27 @@ repositories, ZENworks 7 Linux Management, ZENworks 6.6.x Linux Management servers, as well as local files. +Repositories are primarily identified using their \fIURI\fR or \fIalias\fR. +Alias serves as a shorthand for the long URI or name of the repository. +The \fIname\fR of the repository should briefly describe the repository and +is shown to the user in tables and messages. The name is not required, and +if not known, the alias is shown instead. The alias is required and +uniquely identifies the repository on the system. + +The \fIalias\fR, \fIURI\fR, or the \fInumber\fR from \fBzypper repos\fR list can be used to +specify a repository as an argument of various zypper commands and +options like \fBrefresh\fR, \fB--repo\fR, or \fB--from\fR. + +Apart from the above, repositories have several other properties which can be +set using the commands described in this section below, or by manually +editing the repository definition files (.repo files, see section FILES). + .TP .B addrepo (ar) [options] <URI> <alias> .TP .B addrepo (ar) [options] <FILE.repo> -Add a new repository specified by URI and assign specified alias to it or specify URI to repo file. +Add a new repository specified by URI and assign specified alias to it or specify URI to a .repo file. Newly added repositories have auto-refresh disabled by default (except for repositories imported from a .repo, having the auto-refresh enabled). To enable auto-refresh, use the @@ -1419,7 +1438,7 @@ .TP .B /etc/zypp/repos.d Directory containing repository definition (*.repo) files. -You can use the Repository Management Commands to manipulate these files, +You can use the Repository Management commands to manipulate these files, or you can edit them yourself. In either case, after doing the modifications, executing \fBzypper refresh\fR is strongly recommended. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.2/.gitignore new/zypper-1.2.0/.gitignore --- old/zypper-1.1.2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/zypper-1.2.0/.gitignore 2009-06-08 12:33:56.000000000 +0200 @@ -0,0 +1,2 @@ +.* +build diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.2/package/zypper.changes new/zypper-1.2.0/package/zypper.changes --- old/zypper-1.1.2/package/zypper.changes 2009-06-05 14:17:07.000000000 +0200 +++ new/zypper-1.2.0/package/zypper.changes 2009-06-08 12:33:56.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jun 8 11:55:57 CEST 2009 - jkupec@suse.cz + +- some code cleanup and fixes +- show arch & repo in 'products' +- 1.2.0 + +------------------------------------------------------------------- Thu Jun 4 16:14:17 CEST 2009 - ma@suse.de - Adapt to libzypp-6.8.0 api changes. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.2/src/info.cc new/zypper-1.2.0/src/info.cc --- old/zypper-1.1.2/src/info.cc 2009-06-05 14:17:07.000000000 +0200 +++ new/zypper-1.2.0/src/info.cc 2009-06-08 12:33:56.000000000 +0200 @@ -399,10 +399,14 @@ printNVA(pool_item.resolvable()); Product::constPtr product = asKind<Product>(pool_item.resolvable()); - cout << _("Category") << ": " << product->type() << endl; - cout << _("Flavor") << ": " << product->flavor() << endl; - cout << _("Installed") << ": " << (pool_item.status().isInstalled() ? "Yes" : "No") << endl; - cout << _("Short Name") << ": " << product->shortName() << endl; + cout << _("Is Base") << ": " + << (product->isTargetDistribution() ? _("Yes") : _("No")) << endl; + cout << _("Flavor") << ": " + << product->flavor() << endl; + cout << _("Installed") << ": " + << (pool_item.status().isInstalled() ? _("Yes") : _("No")) << endl; + cout << _("Short Name") + << ": " << product->shortName() << endl; printSummaryDesc(pool_item.resolvable()); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.2/src/search.cc new/zypper-1.2.0/src/search.cc --- old/zypper-1.1.2/src/search.cc 2009-06-05 14:17:07.000000000 +0200 +++ new/zypper-1.2.0/src/search.cc 2009-06-08 12:33:55.000000000 +0200 @@ -535,42 +535,80 @@ // translators: S for installed Status th << _("S"); + if (!zypper.globalOpts().is_rug_compatible) + th << _("Repository"); th << _("Name"); th << _("Version"); if (zypper.globalOpts().is_rug_compatible) - // translators: product category (the rug term) + // translators: product category (base/addon), the rug term th << _("Category"); else - // translators: product type (addon/base) (rug calls it Category) - th << _("Type"); + { + th << _("Arch"); + th << _("Is Base"); + } tbl << th; bool installed_only = zypper.cOpts().count("installed-only"); bool notinst_only = zypper.cOpts().count("uninstalled-only"); - ResPool::byKind_iterator - it = God->pool().byKindBegin(ResKind::product), - e = God->pool().byKindEnd(ResKind::product); + ResPoolProxy::const_iterator + it = God->pool().proxy().byKindBegin(ResKind::product), + e = God->pool().proxy().byKindEnd(ResKind::product); for (; it != e; ++it ) { - Product::constPtr product = asKind<Product>(it->resolvable()); + ui::Selectable::constPtr s = *it; - TableRow tr; - if (it->status().isInstalled()) - { - if (notinst_only) - continue; - tr << "i"; - } - else + // get the first installed object + PoolItem installed; + if (!s->installedEmpty()) + installed = s->installedObj(); + + // show available objects + for_(it, s->availableBegin(), s->availableEnd()) { - if (installed_only) - continue; - tr << ""; + Product::constPtr product = asKind<Product>(it->resolvable()); + TableRow tr; + zypp::PoolItem pi = *it; + string repo = product->repoInfo().name(); + + if (installed) + { + if (notinst_only) + continue; + if (equalNVRA(*installed.resolvable(), *pi.resolvable())) + { + tr << "i"; + // this is needed, other isTargetDistribution would not return + // true for the installed base product + product = asKind<Product>(installed); + } + else + tr << "v"; + } + else + { + if (installed_only) + continue; + tr << ""; + } + // repository + if (!zypper.globalOpts().is_rug_compatible) + tr << repo; + // name + tr << product->name () << product->edition().asString(); + if (zypper.globalOpts().is_rug_compatible) + // rug 'Category' + tr << (product->isTargetDistribution() ? "base" : ""); + else + { + // architecture + tr << product->arch().asString(); + // is base + tr << (product->isTargetDistribution() ? _("Yes") : _("No")); + } + tbl << tr; } - tr << product->name () << product->edition().asString(); - tr << product->type(); - tbl << tr; } tbl.sort(1); // Name diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.2/src/solve-commit.cc new/zypper-1.2.0/src/solve-commit.cc --- old/zypper-1.1.2/src/solve-commit.cc 2009-06-05 14:17:07.000000000 +0200 +++ new/zypper-1.2.0/src/solve-commit.cc 2009-06-08 12:33:56.000000000 +0200 @@ -552,7 +552,9 @@ case 8: // g - view in pager { ostringstream s; + summary.setForceNoColor(true); summary.dumpTo(s); + summary.setForceNoColor(false); show_text_in_pager(s.str()); break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.2/src/Summary.cc new/zypper-1.2.0/src/Summary.cc --- old/zypper-1.1.2/src/Summary.cc 2009-06-05 14:17:07.000000000 +0200 +++ new/zypper-1.2.0/src/Summary.cc 2009-06-08 12:33:55.000000000 +0200 @@ -20,6 +20,7 @@ #include "utils/colors.h" #include "utils/misc.h" #include "Table.h" +#include "Zypper.h" #include "Summary.h" @@ -38,7 +39,7 @@ // -------------------------------------------------------------------------- Summary::Summary(const zypp::ResPool & pool, const ViewOptions options) - : _viewop(options), _wrap_width(80) + : _viewop(options), _wrap_width(80), _force_no_color(false) { readPool(pool); } @@ -677,7 +678,7 @@ count = i->second.size(); if (gotcha) s << ", "; - fprint_color(s, str::form("%d ", count), COLOR_CONTEXT_HIGHLIGHT); + fprint_color(s, str::form("%d ", count), COLOR_CONTEXT_NEGATIVE); if (gotcha) // translators: this text will be preceded by a number e.g. "5 to ..." s << _PL("to remove", "to remove", count); @@ -692,7 +693,7 @@ count = i->second.size(); if (gotcha) s << ", "; - fprint_color(s, str::form("%d ", count), COLOR_CONTEXT_HIGHLIGHT); + fprint_color(s, str::form("%d ", count), COLOR_CONTEXT_NEGATIVE); if (gotcha) // translators: this text will be preceded by a number e.g. "5 to ..." s << _PL("to change vendor", " to change vendor", count); @@ -724,6 +725,16 @@ void Summary::dumpTo(ostream & out) { + struct SetColor + { + SetColor(bool force) : docolors(Zypper::instance()->config().do_colors) + { if (force) Zypper::instance()->config().do_colors = false; } + ~SetColor() + { Zypper::instance()->config().do_colors = docolors; } + bool docolors; + }; + SetColor setcolor(_force_no_color); + _wrap_width = get_screen_width(); writeNewlyInstalled(out); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.2/src/Summary.h new/zypper-1.2.0/src/Summary.h --- old/zypper-1.1.2/src/Summary.h 2009-06-05 14:17:07.000000000 +0200 +++ new/zypper-1.2.0/src/Summary.h 2009-06-08 12:33:56.000000000 +0200 @@ -62,6 +62,8 @@ { _viewop = (ViewOptions) (_viewop & ~option); } void toggleViewOption(const ViewOptions option) { _viewop & option ? unsetViewOption(option) : setViewOption(option); } + void setForceNoColor(bool value = true) + { _force_no_color = value; } void writeNewlyInstalled(std::ostream & out); void writeRemoved(std::ostream & out); @@ -102,6 +104,7 @@ private: ViewOptions _viewop; mutable unsigned _wrap_width; + bool _force_no_color; bool _need_reboot; bool _need_restart; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.2/src/Table.cc new/zypper-1.2.0/src/Table.cc --- old/zypper-1.1.2/src/Table.cc 2009-06-05 14:17:07.000000000 +0200 +++ new/zypper-1.2.0/src/Table.cc 2009-06-08 12:33:55.000000000 +0200 @@ -79,9 +79,10 @@ // table is wider than screen parent._width > parent._screen_width && ( // the next table column would exceed the screen size - curpos + parent._max_width[c] + (parent._style != none ? 2 : 3) > parent._screen_width || + curpos + (int) parent._max_width[c] + (parent._style != none ? 2 : 3) > + parent._screen_width || // or the user wishes to first break after the previous column - parent._force_break_after == c - 1); + parent._force_break_after == (int) (c - 1)); if (do_wrap) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.2/src/Zypper.h new/zypper-1.2.0/src/Zypper.h --- old/zypper-1.1.2/src/Zypper.h 2009-06-05 14:17:07.000000000 +0200 +++ new/zypper-1.2.0/src/Zypper.h 2009-06-08 12:33:56.000000000 +0200 @@ -162,7 +162,7 @@ // setters & getters Out & out(); - const Config & config() const { return _config; } + Config & config() { return _config; } const GlobalOptions & globalOpts() const { return _gopts; } const parsed_opts & cOpts() const { return _copts; } const ZypperCommand & command() const { return _command; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.2/VERSION.cmake new/zypper-1.2.0/VERSION.cmake --- old/zypper-1.1.2/VERSION.cmake 2009-06-05 14:17:07.000000000 +0200 +++ new/zypper-1.2.0/VERSION.cmake 2009-06-08 12:33:56.000000000 +0200 @@ -30,8 +30,8 @@ # note in the changes file. # SET(VERSION_MAJOR "1") -SET(VERSION_MINOR "1") -SET(VERSION_PATCH "2") +SET(VERSION_MINOR "2") +SET(VERSION_PATCH "0") # LAST RELEASED: 1.1.1 #======= ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org