Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at Thu Apr 1 16:05:24 CEST 2010. -------- --- zypper/zypper.changes 2010-03-17 16:32:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2010-04-01 11:27:59.000000000 +0200 @@ -1,0 +2,28 @@ +Thu Apr 1 10:11:27 CEST 2010 - jkupec@suse.cz + +- Merged rpm .spec file cleanup (Pavol Rusnák) +- Fixed crash if no available packages found in repos (bnc #591760) +- 1.4.1 + +------------------------------------------------------------------- +Fri Mar 26 13:08:10 CET 2010 - jkupec@suse.cz + +- --label added to 'targetos' command (bnc #586303) + +------------------------------------------------------------------- +Tue Mar 23 17:00:21 CET 2010 - jkupec@suse.cz + +- Fixed "removed locks:" message not translated (bnc #581332) + +------------------------------------------------------------------- +Tue Mar 23 11:13:10 CET 2010 - jkupec@suse.cz + +- Fixed 'lp --issues' and 'patch --cve #' (bnc #589640) + +------------------------------------------------------------------- +Thu Mar 18 19:37:24 CET 2010 - jkupec@suse.cz + +- Showing full product name in summary, license text, and products + table (bnc #589333) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- zypper-1.4.0.tar.bz2 New: ---- zypper-1.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.s66LEN/_old 2010-04-01 16:04:37.000000000 +0200 +++ /var/tmp/diff_new_pack.s66LEN/_new 2010-04-01 16:04:37.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package zypper (Version 1.4.0) +# spec file for package zypper (Version 1.4.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,25 +19,27 @@ Name: zypper -BuildRequires: boost-devel >= 1.33.1 gettext-devel >= 0.15 libzypp-devel >= 6.30.0 -BuildRequires: augeas-devel >= 0.5.0 readline-devel >= 5.1 -BuildRequires: cmake >= 2.4.6 gcc-c++ >= 4.1 +BuildRequires: libzypp-devel >= 6.30.0 +BuildRequires: boost-devel >= 1.33.1 +BuildRequires: gettext-devel >= 0.15 +BuildRequires: readline-devel >= 5.1 +BuildRequires: augeas-devel >= 0.5.0 +BuildRequires: gcc-c++ >= 4.1 +BuildRequires: cmake >= 2.4.6 Requires: procps %if 0%{?suse_version} %requires_ge libzypp Recommends: logrotate cron -PreReq: permissions +Requires(post): permissions %endif License: GPLv2+ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on Summary: Command line software manager using libzypp -Version: 1.4.0 -Release: 2 +Version: 1.4.1 +Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc -Prefix: /usr Url: http://en.opensuse.org/Zypper Provides: y2pmsh Obsoletes: y2pmsh @@ -72,19 +74,19 @@ %define use_translation_set sle-zypper %endif -cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DSYSCONFDIR=%{_sysconfdir} \ -DMANDIR=%{_mandir} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \ -DCMAKE_BUILD_TYPE=Release \ %{?use_translation_set:-DUSE_TRANSLATION_SET=%use_translation_set} \ .. #gettextize -f -make %{?jobs:-j %jobs} -make -C po %{?jobs:-j %jobs} translations +make %{?_smp_mflags} +make -C po %{?_smp_mflags} translations %install cd build @@ -94,8 +96,8 @@ # Create filelist with translations cd .. %{find_lang} zypper -%{__install} -d -m755 %buildroot%_var/log -touch %buildroot%_var/log/zypper.log +%{__install} -d -m755 $RPM_BUILD_ROOT%{_var}/log +touch $RPM_BUILD_ROOT%{_var}/log/zypper.log %if 0%{?suse_version} @@ -107,6 +109,7 @@ %endif %clean +rm -rf "$RPM_BUILD_ROOT" %files -f zypper.lang %defattr(-,root,root) @@ -118,12 +121,12 @@ %{_bindir}/installation_sources %{_sbindir}/zypp-refresh %verify(not mode) %attr (755,root,root) %{_sbindir}/zypp-refresh-wrapper -%dir %{prefix}/share/zypper -%{prefix}/share/zypper/zypper.aug -%dir %{prefix}/share/zypper/xml -%{prefix}/share/zypper/xml/xmlout.rnc -%dir %{prefix}/include/zypper -%{prefix}/include/zypper/prompt.h +%dir %{_datadir}/zypper +%{_datadir}/zypper/zypper.aug +%dir %{_datadir}/zypper/xml +%{_datadir}/zypper/xml/xmlout.rnc +%dir %{_includedir}/zypper +%{_includedir}/zypper/prompt.h %doc %{_mandir}/*/* %doc %dir %{_datadir}/doc/packages/zypper %doc %{_datadir}/doc/packages/zypper/TODO ++++++ zypper-1.4.0.tar.bz2 -> zypper-1.4.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.4.0/VERSION.cmake new/zypper-1.4.1/VERSION.cmake --- old/zypper-1.4.0/VERSION.cmake 2010-03-17 16:29:11.000000000 +0100 +++ new/zypper-1.4.1/VERSION.cmake 2010-04-01 11:23:47.000000000 +0200 @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "4") -SET(VERSION_PATCH "0") +SET(VERSION_PATCH "1") -# LAST RELEASED: 1.4.0 +# LAST RELEASED: 1.4.1 #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.4.0/package/zypper.changes new/zypper-1.4.1/package/zypper.changes --- old/zypper-1.4.0/package/zypper.changes 2010-03-17 16:29:11.000000000 +0100 +++ new/zypper-1.4.1/package/zypper.changes 2010-04-01 11:23:47.000000000 +0200 @@ -1,4 +1,32 @@ ------------------------------------------------------------------- +Thu Apr 1 10:11:27 CEST 2010 - jkupec@suse.cz + +- Merged rpm .spec file cleanup (Pavol Rusnák) +- Fixed crash if no available packages found in repos (bnc #591760) +- 1.4.1 + +------------------------------------------------------------------- +Fri Mar 26 13:08:10 CET 2010 - jkupec@suse.cz + +- --label added to 'targetos' command (bnc #586303) + +------------------------------------------------------------------- +Tue Mar 23 17:00:21 CET 2010 - jkupec@suse.cz + +- Fixed "removed locks:" message not translated (bnc #581332) + +------------------------------------------------------------------- +Tue Mar 23 11:13:10 CET 2010 - jkupec@suse.cz + +- Fixed 'lp --issues' and 'patch --cve #' (bnc #589640) + +------------------------------------------------------------------- +Thu Mar 18 19:37:24 CET 2010 - jkupec@suse.cz + +- Showing full product name in summary, license text, and products + table (bnc #589333) + +------------------------------------------------------------------- Wed Mar 17 16:20:25 CET 2010 - jkupec@suse.cz - Reporting why specified selectable can't be updated diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.4.0/src/Summary.cc new/zypper-1.4.1/src/Summary.cc --- old/zypper-1.4.0/src/Summary.cc 2010-03-17 16:29:11.000000000 +0100 +++ new/zypper-1.4.1/src/Summary.cc 2010-04-01 11:23:48.000000000 +0200 @@ -329,7 +329,9 @@ for (ResPairSet::const_iterator resit = resolvables.begin(); resit != resolvables.end(); ++resit) // name - s << resit->second->name() + s << (resit->second->kind() == ResKind::product ? + resit->second->summary() : + resit->second->name()) // version (if multiple versions are present) << (dupes.find(resit->second->name()) != dupes.end() ? string("-") + resit->second->edition().asString() : @@ -348,7 +350,9 @@ TableRow tr; // name - tr << resit->second->name() + + tr << (resit->second->kind() == ResKind::product ? + resit->second->summary() : + resit->second->name()) + // version (if multiple versions are present) (dupes.find(resit->second->name()) != dupes.end() && !(_viewop & SHOW_VERSION) ? string("-") + resit->second->edition().asString() : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.4.0/src/Zypper.cc new/zypper-1.4.1/src/Zypper.cc --- old/zypper-1.4.0/src/Zypper.cc 2010-03-17 16:29:11.000000000 +0100 +++ new/zypper-1.4.1/src/Zypper.cc 2010-04-01 11:23:47.000000000 +0200 @@ -430,6 +430,7 @@ { _gopts.machine_readable = true; _gopts.no_abbrev = true; + _gopts.terse = true; //out().error("--terse is not implemented, does nothing"); } @@ -2175,16 +2176,19 @@ { static struct option options[] = { - {"help", no_argument, 0, 'h'}, + {"help", no_argument, 0, 'h'}, + {"label", no_argument, 0, 'l'}, {0, 0, 0, 0} }; specific_options = options; _command_help = _( - "targetos (tos)\n" + "targetos (tos) [options]\n" "\n" - "Show the ID string of the target Operating System.\n" + "Show various information about the target operating system.\n" + "By default, an ID string is shown.\n" "\n" - "This command has no additional options.\n" + " Command options:\n" + "-l, --label Show the operating system label.\n" ); break; } @@ -4139,8 +4143,10 @@ Locks::instance().save(); - //! \todo localize - out().info(str::form("removed locks: %lu", (long unsigned)(start - Locks::instance().size()))); + Locks::size_type diff = start - Locks::instance().size(); + out().info(str::form( + _PL("Removed %lu lock.","Removed %lu locks.", diff), + (long unsigned) diff)); break; } @@ -4151,10 +4157,29 @@ { if (runningHelp()) { out().info(_command_help, Out::QUIET); return; } - // needed to be able to retrieve the target distribution - init_target(*this); + if (out().type() == Out::TYPE_XML) + { + out().error("XML output not implemented for this command."); + break; + } - out().info(God->target()->targetDistribution()); + if (copts.find("label") != copts.end()) + { + if (globalOpts().terse) + { + cout << "labelLong\t" << str::escape(Target::distributionLabel(globalOpts().root_dir).summary, '\t') << endl; + cout << "labelShort\t" << str::escape(Target::distributionLabel(globalOpts().root_dir).shortName, '\t') << endl; + } + else + { + out().info(str::form(_("Distribution Label: %s"), + Target::distributionLabel(globalOpts().root_dir).summary.c_str())); + out().info(str::form(_("Short Label: %s"), + Target::distributionLabel(globalOpts().root_dir).shortName.c_str())); + } + } + else + out().info(Target::targetDistribution(globalOpts().root_dir)); break; } @@ -4187,7 +4212,7 @@ result = lhs.compare(rhs); // be terse when talking to machines - if (_gopts.machine_readable) + if (_gopts.terse) { out().info(str::numstring(result)); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.4.0/src/misc.cc new/zypper-1.4.1/src/misc.cc --- old/zypper-1.4.0/src/misc.cc 2010-03-17 16:29:11.000000000 +0100 +++ new/zypper-1.4.1/src/misc.cc 2010-04-01 11:23:47.000000000 +0200 @@ -83,6 +83,14 @@ // ---------------------------------------------------------------------------- +static string get_display_name(const ResObject::constPtr & obj) +{ + // in most cases we want to display full product name (bnc #589333) + if (obj->kind() == ResKind::product) + return obj->summary(); + return obj->name(); +} + /* debugging static ostream& operator << (ostream & stm, ios::iostate state) @@ -136,9 +144,10 @@ if (license_auto_agree) { zypper.out().info(boost::str( - // TranslatorExplanation The first %s is name of the resolvable, the second is its kind (e.g. 'zypper package') + // translators: the first %s is name of the resolvable, + // the second is its kind (e.g. 'zypper package') format(_("Automatically agreeing with %s %s license.")) - % it->resolvable()->name() + % get_display_name(it->resolvable()) % kind_to_string_localized(it->resolvable()->kind(),1))); MIL << format("Automatically agreeing with %s %s license.") @@ -160,7 +169,7 @@ // is " (package-type)" if other than "package" (patch/product/pattern) _("In order to install '%s'%s, you must agree" " to terms of the following license agreement:"), - it->resolvable()->name().c_str(), kindstr.c_str()); + get_display_name(it->resolvable()).c_str(), kindstr.c_str()); s << endl << endl; // license text @@ -202,7 +211,7 @@ // translators: e.g. "... with flash package license." //! \todo fix this to allow proper translation _("Aborting installation due to user disagreement with %s %s license.")) - % it->resolvable()->name() + % get_display_name(it->resolvable()) % kind_to_string_localized(it->resolvable()->kind(), 1)), Out::QUIET); MIL << "License(s) NOT confirmed (interactive)" << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.4.0/src/search.cc new/zypper-1.4.1/src/search.cc --- old/zypper-1.4.0/src/search.cc 2010-03-17 16:29:11.000000000 +0100 +++ new/zypper-1.4.1/src/search.cc 2010-04-01 11:23:47.000000000 +0200 @@ -616,8 +616,12 @@ // repository if (!zypper.globalOpts().is_rug_compatible) tr << product->repoInfo().name(); - // name - tr << product->name () << product->edition().asString(); + // internal (unix) name + tr << product->name (); + // full name (bnc #589333) + tr << product->summary(); + // version + tr << product->edition().asString(); if (zypper.globalOpts().is_rug_compatible) // rug 'Category' tr << (product->isTargetDistribution() ? "base" : ""); @@ -632,7 +636,7 @@ static void list_product_table(Zypper & zypper) { - MIL << "Going to list packages." << std::endl; + MIL << "Going to list products." << std::endl; Table tbl; TableHeader th; @@ -641,6 +645,9 @@ th << _("S"); if (!zypper.globalOpts().is_rug_compatible) th << _("Repository"); + // translators: used in products. Internal Name is the unix name of the + // product whereas simply Name is the official full name of the product. + th << _("Internal Name"); th << _("Name"); th << _("Version"); if (zypper.globalOpts().is_rug_compatible) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.4.0/src/update.cc new/zypper-1.4.1/src/update.cc --- old/zypper-1.4.0/src/update.cc 2010-03-17 16:29:11.000000000 +0100 +++ new/zypper-1.4.1/src/update.cc 2010-04-01 11:23:47.000000000 +0200 @@ -699,6 +699,8 @@ PoolItem highest = s.highestAvailableVersionObj(); PoolItem installed = s.installedObj(); + if (!installed) + return; DBG << "installed: " << installed << endl; DBG << "highest: " << highest << endl; @@ -706,7 +708,8 @@ if (identical(installed, theone)) { // no update candidate at all - if (identical(installed, highest)) + // (!highest means no available objects in repos. bnc #591760) + if (!highest || identical(installed, highest)) { DBG << "the One (" << theone << ") is installed, skipping." << endl; zypper.out().info(str::form( @@ -910,6 +913,7 @@ string issuesstr; for_(issue, issues.begin(), issues.end()) { + DBG << "querying: " << issue->first << " = " << issue->second << endl; PoolQuery q; q.setMatchSubstring(); q.setCaseSensitive(false); @@ -938,21 +942,21 @@ issuesstr = issue->second; } - cout << "*****" << endl << q << endl << "*****" << endl; - for_(it, q.begin(), q.end()) { PoolItem pi(*it); if (only_needed && !pi.status().isBroken()) continue; + Patch::constPtr patch = asKind<Patch>(pi.resolvable()); + DBG << "got: " << patch << endl; // Print details about each match in that solvable: for_( d, it.matchesBegin(), it.matchesEnd() ) { string itype = d->subFind(sat::SolvAttr::updateReferenceType).asString(); - if (itype != issue->first) + if (issue->first != "issues" && itype != issue->first) continue; TableRow tr; @@ -1064,6 +1068,8 @@ if (!PoolItem(*sit).status().isBroken()) // not needed continue; + DBG << "got: " << *sit << endl; + for_( d, sit.matchesBegin(), sit.matchesEnd() ) { if (issue->first == "b" && @@ -1076,8 +1082,8 @@ DBG << str::form("fix for bugzilla issue number %s was not marked.", issue->second.c_str()); } - else if (issue->first == "b" && - d->subFind(sat::SolvAttr::updateReferenceType).asString() == "bugzilla") + else if (issue->first == "c" && + d->subFind(sat::SolvAttr::updateReferenceType).asString() == "cve") { if (mark_patch_update(*God->pool().proxy().lookup(*sit), zypper.cOpts().count("skip-interactive"), true)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.4.0/zypper.spec.cmake new/zypper-1.4.1/zypper.spec.cmake --- old/zypper-1.4.0/zypper.spec.cmake 2010-03-17 16:29:11.000000000 +0100 +++ new/zypper-1.4.1/zypper.spec.cmake 2010-04-01 11:23:47.000000000 +0200 @@ -11,25 +11,27 @@ # norootforbuild Name: @PACKAGE@ -BuildRequires: libzypp-devel >= 6.30.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 -BuildRequires: readline-devel >= 5.1 augeas-devel >= 0.5.0 -BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6 -Requires: procps +BuildRequires: libzypp-devel >= 6.30.0 +BuildRequires: boost-devel >= 1.33.1 +BuildRequires: gettext-devel >= 0.15 +BuildRequires: readline-devel >= 5.1 +BuildRequires: augeas-devel >= 0.5.0 +BuildRequires: gcc-c++ >= 4.1 +BuildRequires: cmake >= 2.4.6 +Requires: procps %if 0%{?suse_version} -%requires_ge libzypp +%requires_ge libzypp Recommends: logrotate cron -PreReq: permissions +Requires(post): permissions %endif -License: GPL v2 or later +License: GPLv2+ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build -Autoreqprov: on Summary: Command line software manager using libzypp Version: @VERSION@ Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc -Prefix: /usr URL: http://en.opensuse.org/Zypper Provides: y2pmsh Obsoletes: y2pmsh @@ -64,19 +66,19 @@ %define use_translation_set sle-zypper %endif -cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DSYSCONFDIR=%{_sysconfdir} \ -DMANDIR=%{_mandir} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \ -DCMAKE_BUILD_TYPE=Release \ %{?use_translation_set:-DUSE_TRANSLATION_SET=%use_translation_set} \ .. #gettextize -f -make %{?jobs:-j %jobs} -make -C po %{?jobs:-j %jobs} translations +make %{?_smp_mflags} +make -C po %{?_smp_mflags} translations %install cd build @@ -86,8 +88,8 @@ # Create filelist with translations cd .. %{find_lang} zypper -%{__install} -d -m755 %buildroot%_var/log -touch %buildroot%_var/log/zypper.log +%{__install} -d -m755 $RPM_BUILD_ROOT%{_var}/log +touch $RPM_BUILD_ROOT%{_var}/log/zypper.log %if 0%{?suse_version} %post @@ -98,7 +100,7 @@ %endif %clean - +rm -rf "$RPM_BUILD_ROOT" %files -f zypper.lang %defattr(-,root,root) @@ -110,12 +112,12 @@ %{_bindir}/installation_sources %{_sbindir}/zypp-refresh %verify(not mode) %attr (755,root,root) %{_sbindir}/zypp-refresh-wrapper -%dir %{prefix}/share/zypper -%{prefix}/share/zypper/zypper.aug -%dir %{prefix}/share/zypper/xml -%{prefix}/share/zypper/xml/xmlout.rnc -%dir %{prefix}/include/zypper -%{prefix}/include/zypper/prompt.h +%dir %{_datadir}/zypper +%{_datadir}/zypper/zypper.aug +%dir %{_datadir}/zypper/xml +%{_datadir}/zypper/xml/xmlout.rnc +%dir %{_includedir}/zypper +%{_includedir}/zypper/prompt.h %doc %{_mandir}/*/* %doc %dir %{_datadir}/doc/packages/zypper %doc %{_datadir}/doc/packages/zypper/TODO ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org