February 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r8943 - in /branches/SuSE-SLE-10-SP2-Branch/zypper/src: zmart-keyring-callbacks.h zmart-misc.cc zmart-sources.cc zypp-checkpatches.cc zypper-search.cc zypper.cc
by jkupec＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: jkupec Date: Thu Feb 28 12:20:52 2008 New Revision: 8943 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8943&view=rev Log: - texts correction based on proof-reading Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-keyring-callbacks.h branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-misc.cc branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-sources.cc branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypp-checkpatches.cc branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper-search.cc branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper.cc Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-keyring-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/zypper… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-keyring-callbacks.h (original) +++ branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-keyring-callbacks.h Thu Feb 28 12:20:52 2008 @@ -119,7 +119,7 @@ cerr << boost::format( _("Warning: Ignoring failed signature verification for %s" " with public key id %s, %s, fingerprint %s!" - " Double-check this is not caused by some malicious" + " Make sure this is not caused by some malicious" " changes in the file!")) %file % keyid % keyname % fingerprint << endl; return true; Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/zypper… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-misc.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-misc.cc Thu Feb 28 12:20:52 2008 @@ -558,8 +558,7 @@ if (!pm_tbl.empty ()) { if (!tbl.empty ()) { cerr << _("WARNING: These are only the updates affecting the updater itself.\n" - "There are others available too.\n") << flush; - + "Other updates are available too.\n") << flush; } tbl = pm_tbl; } @@ -781,11 +780,11 @@ if (excpt_r.msg().find("fails integrity check") != string::npos) { cerr << endl << _("Package integrity check failed. This may be a problem" - " with installation source or media. Try one of the following:\n" + " with the installation source or media. Try one of the following:\n" "\n" - "- just retry previous command\n" + "- retry previous command\n" "- refresh installation sources using 'zypper refresh'\n" - "- use another installation media (if e.g. damaged)\n" + "- use another installation media (for example, if yours is damaged)\n" "- use another installation source") << endl; return ZYPPER_EXIT_ERR_ZYPP; } @@ -799,7 +798,7 @@ retv = ZYPPER_EXIT_OK; else if (retv == ZYPPER_EXIT_INF_REBOOT_NEEDED) cout << _("WARNING: One of installed patches requires reboot of" - " your machine. Please, do it as soon as possible.") << endl; + " your machine. Reboot as soon as possible.") << endl; else if (retv == ZYPPER_EXIT_INF_RESTART_NEEDED) cout << _("WARNING: One of installed patches affects the package" " manager itself, thus it requires restart before executing" Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-sources.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/zypper… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-sources.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/zypper/src/zmart-sources.cc Thu Feb 28 12:20:52 2008 @@ -77,7 +77,7 @@ } catch( const Exception & excpt_r ) { - cerr << _("Can't access repository") << endl; + cerr << _("Cannot access repository") << endl; ZYPP_CAUGHT( excpt_r ); exit(-1); } Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypp-checkpatches.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/zypper… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypp-checkpatches.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypp-checkpatches.cc Thu Feb 28 12:20:52 2008 @@ -210,7 +210,7 @@ { // TranslatorExplanation %s = detailed low level (unstranslated) error message string error = excpt_r.msg(); - gData.errors.push_back(str::form(_("Couldn't restore source.\nDetail: %s"), error.c_str())); + gData.errors.push_back(str::form(_("Could not restore source.\nDetail: %s"), error.c_str())); } } Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper-search.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/zypper… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper-search.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper-search.cc Thu Feb 28 12:20:52 2008 @@ -43,7 +43,7 @@ // no sources warning if (gData.sources.empty()) { cerr << _("No sources. Zypper currently searches within installation" - "sources only.") << endl; + " sources only.") << endl; exit(2); // TODO #define zypper error codes? } Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/zypper… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/zypper/src/zypper.cc Thu Feb 28 12:20:52 2008 @@ -131,7 +131,7 @@ "\t--terse, -t\t\tTerse output for machine consumption\n" "\t--table-style, -s\tTable style (integer)\n" "\t--rug-compatible, -r\tTurn on rug compatibility\n" - "\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n" + "\t--non-interactive, -n\tDo not ask anything, use default answers automatically.\n" "\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n" "\t--root, -R <dir>\tOperate on a different root directory\n"); @@ -149,7 +149,7 @@ if (gopts.count("no-gpg-checks")) { gSettings.no_gpg_checks = true; - cout << _("Entering no-gpg-checks mode.") << endl; + cout << _("Entering 'no-gpg-checks' mode.") << endl; MIL << "Entering no-gpg-checks mode" << endl; } @@ -409,8 +409,8 @@ " Command options:\n" " --match-all Search for a match to all search strings (default)\n" " --match-any Search for a match to any of the search strings\n" - " --match-substrings Matches for search strings may be partial words (default)\n" - " --match-words Matches for search strings may only be whole words\n" + " --match-substrings Search for a match to partial words (default)\n" + " --match-words Search for a match to whole words only\n" " --match-exact Searches for an exact package name\n" "-d, --search-descriptions Search also in package summaries and descriptions.\n" "-c, --case-sensitive Perform case-sensitive search.\n" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8942 - in /trunk/zypper/src: output/xmlout.rnc zypper-repos.cc
by jkupec＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: jkupec Date: Thu Feb 28 10:16:47 2008 New Revision: 8942 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8942&view=rev Log: - repo list for xmlout Modified: trunk/zypper/src/output/xmlout.rnc trunk/zypper/src/zypper-repos.cc Modified: trunk/zypper/src/output/xmlout.rnc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/xmlout.rnc?rev… ============================================================================== --- trunk/zypper/src/output/xmlout.rnc (original) +++ trunk/zypper/src/output/xmlout.rnc Thu Feb 28 10:16:47 2008 @@ -100,7 +100,19 @@ element install-summary { empty } # TODO repo-list-element = - element repo-list { empty } # TODO + element repo-list { + element repo { + attribute alias { xsd:string }, + attribute name { xsd:string }?, + attribute type { xsd:string }?, + attribute enabled { xsd:boolean }?, + attribute autorefresh { xsd:boolean }?, + attribute gpgcheck { xsd:boolean }?, + attribute gpgkey { xsd:anyURI }?, + attribute mirrorlist { xsd:anyURI }?, + element url { xsd:anyURI }+ + }* + } solver-problem-element = element solver-problem { empty } # TODO Modified: trunk/zypper/src/zypper-repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=8… ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/zypper-repos.cc Thu Feb 28 10:16:47 2008 @@ -589,6 +589,38 @@ // ---------------------------------------------------------------------------- +/** Repo list as xml */ +static void print_xml_repo_list(Zypper & zypper, list<RepoInfo> repos) +{ + cout << "<repo-list>" << endl; + for (std::list<RepoInfo>::const_iterator it = repos.begin(); + it != repos.end(); ++it) + { + string tmpstr; + cout << "<repo"; + cout << " alias=\"" << xml_encode(it->alias()) << "\""; + cout << " name=\"" << xml_encode(it->name()) << "\""; + cout << " type=\"" << it->type().asString() << "\""; + cout << " enabled=\"" << it->enabled() << "\""; + cout << " autorefresh=\"" << it->autorefresh() << "\""; + cout << " gpgcheck=\"" << it->gpgCheck() << "\""; + if (!(tmpstr = it->gpgKeyUrl().asString()).empty()) + cout << " gpgkey=\"" << xml_encode(tmpstr) << "\""; + if (!(tmpstr = it->mirrorListUrl().asString()).empty()) + cout << " mirrorlist=\"" << xml_encode(tmpstr) << "\""; + cout << ">" << endl; + + for (RepoInfo::urls_const_iterator urlit = it->baseUrlsBegin(); + urlit != it->baseUrlsEnd(); ++urlit) + cout << "<url>" << xml_encode(urlit->asString()) << "</url>" << endl; + + cout << "</repo>" << endl; + } + cout << "</repo-list>" << endl; +} + +// ---------------------------------------------------------------------------- + void print_repos_to(const std::list<zypp::RepoInfo> &repos, ostream & out) { for (std::list<RepoInfo>::const_iterator it = repos.begin(); @@ -656,6 +688,9 @@ } } } + // print repo list as xml + else if (zypper.out().type() == Out::TYPE_XML) + print_xml_repo_list(zypper, repos); // print repo list the rug's way else if (zypper.globalOpts().is_rug_compatible) print_rug_sources_list(repos); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8941 - in /trunk/zypper/src: zypper.cc zypper.h
by jkupec＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: jkupec Date: Wed Feb 27 20:09:11 2008 New Revision: 8941 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8941&view=rev Log: - use scoped pointer for Zypper - cleanup Modified: trunk/zypper/src/zypper.cc trunk/zypper/src/zypper.h Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8941&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Wed Feb 27 20:09:11 2008 @@ -47,14 +47,12 @@ using namespace std; using namespace zypp; -//using namespace zypp::detail; using namespace boost; ZYpp::Ptr God = NULL; RuntimeData gData; parsed_opts copts; // command options -IMPL_PTR_TYPE(Zypper); Zypper::Zypper() : _argc(0), _argv(NULL), _out_ptr(NULL), @@ -74,12 +72,12 @@ } -Zypper_Ptr Zypper::instance() +Zypper::Ptr & Zypper::instance() { - static Zypper_Ptr _instance; + static Zypper::Ptr _instance; if (!_instance) - _instance = new Zypper(); + _instance.reset(new Zypper()); else XXX << "Got an existing instance." << endl; Modified: trunk/zypper/src/zypper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=8941&r1=… ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/zypper.h Wed Feb 27 20:09:11 2008 @@ -5,7 +5,6 @@ #include <vector> #include "zypp/base/Exception.h" -#include "zypp/base/ReferenceCounted.h" #include "zypp/base/NonCopyable.h" #include "zypp/base/PtrTypes.h" @@ -74,13 +73,12 @@ bool license_auto_agree; }; - -DEFINE_PTR_TYPE(Zypper); - -class Zypper : public zypp::base::ReferenceCounted, private zypp::base::NonCopyable +class Zypper : private zypp::base::NonCopyable { public: - static Zypper_Ptr instance(); + typedef zypp::RW_pointer<Zypper,zypp::rw_pointer::Scoped<Zypper> > Ptr; + + static Ptr & instance(); int main(int argc, char ** argv); @@ -99,10 +97,11 @@ int argc() { return _running_shell ? _sh_argc : _argc; } char ** argv() { return _running_shell ? _sh_argv : _argv; } - + +public: + ~Zypper(); private: Zypper(); - ~Zypper(); void processGlobalOptions(); void processCommandOptions(); @@ -159,7 +158,6 @@ }; extern RuntimeData gData; -extern std::ostream no_stream; class ExitRequestException : public zypp::Exception { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8940 - /trunk/zypper/src/output/xmlout.rnc
by jkupec＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: jkupec Date: Wed Feb 27 19:41:19 2008 New Revision: 8940 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8940&view=rev Log: - <update> made more compact Modified: trunk/zypper/src/output/xmlout.rnc Modified: trunk/zypper/src/output/xmlout.rnc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/xmlout.rnc?rev… ============================================================================== --- trunk/zypper/src/output/xmlout.rnc (original) +++ trunk/zypper/src/output/xmlout.rnc Wed Feb 27 19:41:19 2008 @@ -1,18 +1,22 @@ -# !! still WORK IN PROGRESS !! +# !! still WORK IN PROGRESS (untill 11.0 freeze) !! # namespace zypper -# common stuff -# progress, messages, prompts, status - -# special stuff -# updates list, installation summary, search output - start = stream-element stream-element = element stream { - ( progress-elements* | download-progress-elements* | message-element* | prompt-element* | - update-status-element* )+ + ( + # common stuff (progress, messages, prompts, status) + progress-elements* | download-progress-elements* | message-element* | prompt-element* | + + # special stuff (updates list, installation summary, search output, info) + update-status-element* | + install-summary-element* | + repo-list-element? | + solver-problem-element* | + list-element? | + info-element? + )+ } progress-elements = ( progress-element | progress-done ) @@ -62,37 +66,47 @@ update-status-element = element update-status { attribute version {xsd:string}, - element update-list { ( patch-update | other-update)* } + element update-list { ( patch-update | other-update )* } + } + +update-commons = + attribute name { xsd:string }, + attribute edition { xsd:string }, + element summary { text }, + element description { text }, + element license { text }, + element source { # repository + attribute url { xsd:anyURI }, + attribute alias { xsd:string } } other-update = element update { - attribute name { xsd:string }, - attribute edition { xsd:string }, - attribute kind { xsd:string }, # package, pattern, product - element summary { text }, - element description { text }, - element license { text }, - element source { # repository - attribute url { xsd:anyURI }, - attribute alias { xsd:string } - } + update-commons, + attribute kind { "package" | "pattern" | "product" } } patch-update = element update { - attribute name { xsd:string }, - attribute edition { xsd:string }, + update-commons, attribute kind { "patch" }, attribute category { xsd:string }?, # patch category (security, recommended, ...) attribute pkgmanager { xsd:boolean }, # affect package management? attribute restart { xsd:boolean }, # needs restart of the machine? - attribute interactive { xsd:boolean },# needs user interaction? - element summary { text }, - element description { text }, - element license { text }, - element source { # repository - attribute url { xsd:anyURI }, - attribute alias { xsd:string } - } + attribute interactive { xsd:boolean } # needs user interaction? } + +install-summary-element = + element install-summary { empty } # TODO + +repo-list-element = + element repo-list { empty } # TODO + +solver-problem-element = + element solver-problem { empty } # TODO + +list-element = + element list { empty } # TODO + +info-element = + element info { empty } # TODO -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8939 - /trunk/zypper/src/output/xmlout.rnc
by jkupec＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: jkupec Date: Wed Feb 27 19:07:18 2008 New Revision: 8939 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8939&view=rev Log: - patch update added Modified: trunk/zypper/src/output/xmlout.rnc Modified: trunk/zypper/src/output/xmlout.rnc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/xmlout.rnc?rev… ============================================================================== --- trunk/zypper/src/output/xmlout.rnc (original) +++ trunk/zypper/src/output/xmlout.rnc Wed Feb 27 19:07:18 2008 @@ -62,18 +62,37 @@ update-status-element = element update-status { attribute version {xsd:string}, - element update-list { - element update { - attribute name { xsd:string }, - attribute edition { xsd:string }, - attribute kind { xsd:string }, - element summary { text }, - element description { text }, - element license { text }, - element source { # repository - attribute url { xsd:anyURI }, - attribute alias { xsd:string } - } - }* + element update-list { ( patch-update | other-update)* } + } + +other-update = + element update { + attribute name { xsd:string }, + attribute edition { xsd:string }, + attribute kind { xsd:string }, # package, pattern, product + element summary { text }, + element description { text }, + element license { text }, + element source { # repository + attribute url { xsd:anyURI }, + attribute alias { xsd:string } + } + } + +patch-update = + element update { + attribute name { xsd:string }, + attribute edition { xsd:string }, + attribute kind { "patch" }, + attribute category { xsd:string }?, # patch category (security, recommended, ...) + attribute pkgmanager { xsd:boolean }, # affect package management? + attribute restart { xsd:boolean }, # needs restart of the machine? + attribute interactive { xsd:boolean },# needs user interaction? + element summary { text }, + element description { text }, + element license { text }, + element source { # repository + attribute url { xsd:anyURI }, + attribute alias { xsd:string } } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8938 - /trunk/zypper/src/zypper-misc.cc
by jkupec＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: jkupec Date: Wed Feb 27 19:07:09 2008 New Revision: 8938 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8938&view=rev Log: - cleanup Modified: trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=89… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Wed Feb 27 19:07:09 2008 @@ -1077,13 +1077,13 @@ !pkg_mgr_available ) { cout << " <update "; - cout << "name=\"" << res->name () << "\" " ; + cout << "name=\"" << res->name () << "\" "; cout << "edition=\"" << res->edition ().asString() << "\" "; cout << "category=\"" << patch->category() << "\" "; - cout << "pkgmanager=\"" << ((patch->affects_pkg_manager()) ? "true" : "false") << "\" "; - cout << "restart=\"" << ((patch->reboot_needed()) ? "true" : "false") << "\" "; - cout << "interactive=\"" << ((patch->interactive()) ? "true" : "false") << "\" "; - cout << "kind=\"" << "patch" << "\" "; + cout << "pkgmanager=\"" << (patch->affects_pkg_manager() ? "true" : "false") << "\" "; + cout << "restart=\"" << (patch->reboot_needed() ? "true" : "false") << "\" "; + cout << "interactive=\"" << (patch->interactive() ? "true" : "false") << "\" "; + cout << "kind=\"patch\""; cout << ">" << endl; cout << " <summary>" << xml_encode(patch->summary()) << " </summary>" << endl; cout << " <description>" << xml_encode(patch->description()) << "</description>" << endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8937 - /trunk/zypper/src/output/xmlout.rnc
by jkupec＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: jkupec Date: Wed Feb 27 18:44:09 2008 New Revision: 8937 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8937&view=rev Log: - update status added Modified: trunk/zypper/src/output/xmlout.rnc Modified: trunk/zypper/src/output/xmlout.rnc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/xmlout.rnc?rev… ============================================================================== --- trunk/zypper/src/output/xmlout.rnc (original) +++ trunk/zypper/src/output/xmlout.rnc Wed Feb 27 18:44:09 2008 @@ -11,18 +11,17 @@ stream-element = element stream { - ( progress-elements | download-progress-elements | message-element | prompt-element | - update-element )+ + ( progress-elements* | download-progress-elements* | message-element* | prompt-element* | + update-status-element* )+ } progress-elements = ( progress-element | progress-done ) -# todo - restrict and specialize progress by type progress-element = element progress { attribute id { xsd:string }, attribute name { xsd:string }, - attribute value { xsd:integer }? + attribute value { xsd:integer }? # missing value means an 'is alive' notification } progress-done = @@ -60,5 +59,21 @@ text } -update-element = - element update { empty } +update-status-element = + element update-status { + attribute version {xsd:string}, + element update-list { + element update { + attribute name { xsd:string }, + attribute edition { xsd:string }, + attribute kind { xsd:string }, + element summary { text }, + element description { text }, + element license { text }, + element source { # repository + attribute url { xsd:anyURI }, + attribute alias { xsd:string } + } + }* + } + } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8936 - in /trunk/zypper/src: zypper-misc.cc zypper-misc.h
by jkupec＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: jkupec Date: Wed Feb 27 17:39:24 2008 New Revision: 8936 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8936&view=rev Log: - hide more local funtions Modified: trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-misc.h Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=89… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Wed Feb 27 17:39:24 2008 @@ -36,6 +36,17 @@ extern ZYpp::Ptr God; extern RuntimeData gData; + +/** + * Loops through resolvables, checking if there is license to confirm. When + * run interactively, it displays a dialog, otherwise it answers automatically + * according to --auto-agree-with-licenses present or not present. + * + * \returns true if all licenses have been confirmed, false otherwise. + */ +static bool confirm_licenses(Zypper & zypper); + + // converts a user-supplied kind to a zypp kind object // returns an empty one if not recognized ResObject::Kind string_to_kind (const string &skind) @@ -162,7 +173,7 @@ }; // on error print a message and return noCap -Capability safe_parse_cap (Zypper & zypper, +static Capability safe_parse_cap (Zypper & zypper, const ResObject::Kind &kind, const string & capstr) { Capability cap; @@ -231,7 +242,7 @@ // this does only resolvables with this _name_. // we could also act on _provides_ // TODO edition, arch -void mark_for_install(Zypper & zypper, +static void mark_for_install(Zypper & zypper, const ResObject::Kind &kind, const std::string &name) { @@ -311,7 +322,7 @@ }; // mark all matches -void mark_for_uninstall(Zypper & zypper, +static void mark_for_uninstall(Zypper & zypper, const ResObject::Kind &kind, const std::string &name) { @@ -436,7 +447,7 @@ } //! @return true to retry solving now, false to cancel, indeterminate to continue -tribool show_problem (Zypper & zypper, +static tribool show_problem (Zypper & zypper, const ResolverProblem & prob, ProblemSolutionList & todo) { //! \todo use Out @@ -505,7 +516,7 @@ } // return true to retry solving, false to cancel transaction -bool show_problems(Zypper & zypper) +static bool show_problems(Zypper & zypper) { bool retry = true; Resolver_Ptr resolver = zypp::getZYpp()->resolver(); @@ -556,7 +567,7 @@ typedef map<Resolvable::Kind,set<ResObject::constPtr> > KindToResObjectSet; -void show_summary_resolvable_list(const string & label, +static void show_summary_resolvable_list(const string & label, KindToResObjectSet::const_iterator it, int verbosity) { @@ -856,7 +867,7 @@ } */ -void dump_pool () +static void dump_pool () { int count = 1; static bool full_pool_shown = false; @@ -966,7 +977,7 @@ out.info(s.str(), Out::QUIET); } -string string_status (const ResStatus& rs) +static string string_status (const ResStatus& rs) { bool i = rs.isInstalled (); if (rs.isUndetermined ()) @@ -1101,7 +1112,7 @@ // ---------------------------------------------------------------------------- -void list_patch_updates(Zypper & zypper, bool best_effort) +static void list_patch_updates(Zypper & zypper, bool best_effort) { Table tbl; Table pm_tbl; // only those that affect packagemanager: they have priority @@ -1373,7 +1384,7 @@ } // may be useful as a functor -bool mark_item_install (const PoolItem& pi) { +static bool mark_item_install (const PoolItem& pi) { bool result = pi.status().setToBeInstalled( zypp::ResStatus::USER ); if (!result) { DBG << "Marking " << pi << "for installation failed" << endl; @@ -1391,7 +1402,7 @@ // multiple installed resolvables of the same name. // LookForArchUpdate will return the one with the highest edition. -PoolItem +static PoolItem findInstalledItem( PoolItem item ) { const zypp::ResPool& pool = God->pool(); @@ -1412,7 +1423,7 @@ // to which an update candidate is guaranteed to exist. // // may be useful as a functor -bool require_item_update (const PoolItem& pi) { +static bool require_item_update (const PoolItem& pi) { Resolver_Ptr resolver = zypp::getZYpp()->resolver(); PoolItem installed = findInstalledItem( pi ); @@ -1653,7 +1664,7 @@ // ask for [y/n/r] with 'r' for read the license text // (opened throu more or less, etc...) // - after negative answer, call solve_and_commit() again -bool confirm_licenses(Zypper & zypper) +static bool confirm_licenses(Zypper & zypper) { bool confirmed = true; @@ -1725,7 +1736,7 @@ return confirmed; } -SrcPackage::constPtr source_find( const string & arg ) +static SrcPackage::constPtr source_find( const string & arg ) { /* * Workflow: Modified: trunk/zypper/src/zypper-misc.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.h?rev=893… ============================================================================== --- trunk/zypper/src/zypper-misc.h (original) +++ trunk/zypper/src/zypper-misc.h Wed Feb 27 17:39:24 2008 @@ -17,21 +17,9 @@ #include "zypper-tabulator.h" #include "zypper-utils.h" -/// Parse a capability string. On error print a message and return noCap -zypp::Capability safe_parse_cap (Zypper & zypper, - const zypp::ResObject::Kind &kind, - const std::string &capstr); zypp::ResObject::Kind string_to_kind (const std::string &skind); -void mark_for_install(Zypper & zypper, - const zypp::ResObject::Kind &kind, - const std::string &name); - -void mark_for_uninstall(Zypper & zypper, - const zypp::ResObject::Kind &kind, - const std::string &name); - void mark_by_name (Zypper & zypper, bool install_not_remove, const zypp::ResObject::Kind &kind, @@ -104,14 +92,6 @@ */ void solve_and_commit(Zypper & zypper); -/** - * Loops through resolvables, checking if there is license to confirm. When - * run interactively, it displays a dialog, otherwise it answers automatically - * according to --auto-agree-with-licenses present or not present. - * - * \returns true if all licenses have been confirmed, false otherwise. - */ -bool confirm_licenses(Zypper & zypper); // copied from yast2-pkg-bindings:PkgModuleFunctions::DoProvideNameKind struct ProvideProcess -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8935 - in /trunk/zypper/src: output/OutXML.cc zypper-misc.cc zypper-utils.cc zypper-utils.h
by jkupec＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: jkupec Date: Wed Feb 27 16:58:32 2008 New Revision: 8935 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8935&view=rev Log: - use libzypp's xml encoder Modified: trunk/zypper/src/output/OutXML.cc trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-utils.cc trunk/zypper/src/zypper-utils.h Modified: trunk/zypper/src/output/OutXML.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutXML.cc?rev=… ============================================================================== --- trunk/zypper/src/output/OutXML.cc (original) +++ trunk/zypper/src/output/OutXML.cc Wed Feb 27 16:58:32 2008 @@ -2,6 +2,7 @@ #include <sstream> #include "OutXML.h" +#include "../zypper-utils.h" using std::cout; using std::endl; @@ -36,6 +37,7 @@ return false; } +/* string xmlEncode(const string & s) { string result; @@ -62,13 +64,14 @@ return result; } +*/ void OutXML::info(const string & msg, Verbosity verbosity, Type mask) { if (infoWarningFilter(verbosity, mask)) return; - cout << "<message type=\"info\">" << xmlEncode(msg) + cout << "<message type=\"info\">" << xml_encode(msg) << "</message>" << endl; } @@ -77,13 +80,13 @@ if (infoWarningFilter(verbosity, mask)) return; - cout << "<message type=\"warning\">" << xmlEncode(msg) + cout << "<message type=\"warning\">" << xml_encode(msg) << "</message>" << endl; } void OutXML::error(const string & problem_desc, const string & hint) { - cout << "<message type=\"error\">" << xmlEncode(problem_desc) + cout << "<message type=\"error\">" << xml_encode(problem_desc) << "</message>" << endl; //! \todo hint } @@ -102,7 +105,7 @@ if (!hint.empty()) s << hint << endl; - cout << "<message type=\"error\">" << xmlEncode(s.str()) + cout << "<message type=\"error\">" << xml_encode(s.str()) << "</message>" << endl; } @@ -110,8 +113,8 @@ int value, bool done, bool error) { cout << "<progress"; - cout << " id=\"" << xmlEncode(id) << "\""; - cout << " name=\"" << xmlEncode(label) << "\""; + cout << " id=\"" << xml_encode(id) << "\""; + cout << " name=\"" << xml_encode(label) << "\""; if (done) cout << " done=\"" << error << "\""; // print value only if it is known (percentage progress) @@ -153,7 +156,7 @@ void OutXML::dwnldProgressStart(const zypp::Url & uri) { cout << "<download" - << " url=\"" << xmlEncode(uri.asString()) << "\"" + << " url=\"" << xml_encode(uri.asString()) << "\"" << " percent=\"-1\"" << " rate=\"-1\"" << "/>" << endl; @@ -164,7 +167,7 @@ int rate) { cout << "<download" - << " url=\"" << xmlEncode(uri.asString()) << "\"" + << " url=\"" << xml_encode(uri.asString()) << "\"" << " percent=\"" << value << "\"" << " rate=\"" << rate << "\"" << "/>" << endl; @@ -173,7 +176,7 @@ void OutXML::dwnldProgressEnd(const zypp::Url & uri, int rate, bool error) { cout << "<download" - << " url=\"" << xmlEncode(uri.asString()) << "\"" + << " url=\"" << xml_encode(uri.asString()) << "\"" << " rate=\"" << rate << "\"" << " done=\"" << error << "\"" << "/>" << endl; @@ -183,6 +186,6 @@ const string & prompt, const string & answer_hint) // hint ignored for now, maybe an enumeration will be here in the future { - cout << "<prompt id=\"" << id << "\">" << xmlEncode(prompt) + cout << "<prompt id=\"" << id << "\">" << xml_encode(prompt) << "</prompt>" << endl; } Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=89… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Wed Feb 27 16:58:32 2008 @@ -21,8 +21,6 @@ #include "zypp/Capabilities.h" -#include "zypp/parser/xml_escape_parser.hpp" - #include "zypper.h" #include "zypper-main.h" #include "zypper-utils.h" @@ -31,8 +29,6 @@ #include "zypper-callbacks.h" #include "output/prompt.h" -//using namespace zypp::detail; - using namespace std; using namespace zypp; using namespace boost; @@ -118,12 +114,6 @@ return true; } -static std::string xml_escape( const std::string &text ) -{ - iobind::parser::xml_escape_parser parser; - return parser.escape(text); -} - /** * Stops iterations on first item and stores edition of the found item. * @@ -1084,9 +1074,9 @@ cout << "interactive=\"" << ((patch->interactive()) ? "true" : "false") << "\" "; cout << "kind=\"" << "patch" << "\" "; cout << ">" << endl; - cout << " <summary>" << xml_escape(patch->summary()) << " </summary>" << endl; - cout << " <description>" << xml_escape(patch->description()) << "</description>" << endl; - cout << " <license>" << xml_escape(patch->licenseToConfirm()) << "</license>" << endl; + cout << " <summary>" << xml_encode(patch->summary()) << " </summary>" << endl; + cout << " <description>" << xml_encode(patch->description()) << "</description>" << endl; + cout << " <license>" << xml_encode(patch->licenseToConfirm()) << "</license>" << endl; if ( !patch->repoInfo().alias().empty() ) { @@ -1457,9 +1447,9 @@ cout << "edition=\"" << res->edition ().asString() << "\" "; cout << "kind=\"" << res->kind() << "\" "; cout << ">" << endl; - cout << " <summary>" << xml_escape(res->summary()) << " </summary>" << endl; - cout << " <description>" << xml_escape(res->description()) << "</description>" << endl; - cout << " <license>" << xml_escape(res->licenseToConfirm()) << "</license>" << endl; + cout << " <summary>" << xml_encode(res->summary()) << " </summary>" << endl; + cout << " <description>" << xml_encode(res->description()) << "</description>" << endl; + cout << " <license>" << xml_encode(res->licenseToConfirm()) << "</license>" << endl; if ( !res->repoInfo().alias().empty() ) { Modified: trunk/zypper/src/zypper-utils.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-utils.cc?rev=8… ============================================================================== --- trunk/zypper/src/zypper-utils.cc (original) +++ trunk/zypper/src/zypper-utils.cc Wed Feb 27 16:58:32 2008 @@ -4,9 +4,10 @@ #include <readline/readline.h> #include <readline/history.h> +#include "zypp/Pathname.h" #include "zypp/base/Logger.h" #include "zypp/media/MediaManager.h" -#include "zypp/Pathname.h" +#include "zypp/parser/xml_escape_parser.hpp" #include "zypper-main.h" #include "zypper-utils.h" @@ -233,3 +234,9 @@ return Pathname(); } + +string xml_encode(const string & text) +{ + iobind::parser::xml_escape_parser parser; + return parser.escape(text); +} Modified: trunk/zypper/src/zypper-utils.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-utils.h?rev=89… ============================================================================== --- trunk/zypper/src/zypper-utils.h (original) +++ trunk/zypper/src/zypper-utils.h Wed Feb 27 16:58:32 2008 @@ -55,4 +55,6 @@ zypp::Pathname cache_rpm(const std::string & rpm_uri_str, const std::string & cache_dir); +std::string xml_encode(const std::string & text); + #endif /*ZYPPER_UTILS_H*/ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8934 - in /branches/SuSE-SLE-10-SP2-Branch/libzypp: VERSION package/libzypp.changes zypp/solver/detail/InstallOrder.cc
by mlandres＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: mlandres Date: Wed Feb 27 16:49:23 2008 New Revision: 8934 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8934&view=rev Log: Fixed computation of install order. Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/solver/detail/InstallOrder.cc Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzyp… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION Wed Feb 27 16:49:23 2008 @@ -49,5 +49,5 @@ m4_define([LIBZYPP_MINOR], [30]) m4_define([LIBZYPP_COMPATMINOR], [15]) dnl ================================================== -m4_define([LIBZYPP_PATCH], [6]) +m4_define([LIBZYPP_PATCH], [7]) dnl ================================================== Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzyp… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes Wed Feb 27 16:49:23 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Feb 27 16:10:00 CET 2008 - ma(a)suse.de + +- Fixed computation of install order. Take requirements of + an installed packages uninstall scripts into account, if + the package is updated. (#258682,bnc #270514) +- version 2.30.7 +- revision 8934 + +------------------------------------------------------------------- Thu Feb 14 10:37:19 CET 2008 - jkupec(a)suse.cz - show special 'registration expired' message in HTTP response 403 Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/solver/detail/InstallOrder.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzyp… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/solver/detail/InstallOrder.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/solver/detail/InstallOrder.cc Wed Feb 27 16:49:23 2008 @@ -28,13 +28,14 @@ /-*/ #include "zypp/solver/detail/InstallOrder.h" -#include "zypp/base/Logger.h" +#include "zypp/base/LogTools.h" #include "zypp/base/Iterator.h" #include "zypp/base/Algorithm.h" #include "zypp/ResFilters.h" #include "zypp/ResStatus.h" #include "zypp/CapAndItem.h" +#include "zypp/NameKindProxy.h" ///////////////////////////////////////////////////////////////////////// namespace zypp @@ -225,20 +226,29 @@ nodeinfo.begintime = _rdfstime; _rdfstime++; + // items prereq + CapSet prq( item->dep(Dep::PREREQUIRES) ); + // an installed items prereq (in case they are reqired for uninstall scripts) + NameKindProxy nkp( _pool, item->name(), item->kind() ); + if ( ! nkp.installedEmpty() ) + { + prq.insert( (*nkp.installedBegin())->dep(Dep::PREREQUIRES).begin(), + (*nkp.installedBegin())->dep(Dep::PREREQUIRES).end() ); + } // put prerequires first and requires last on list to ensure // that prerequires are processed first - for (CapSet::const_iterator it = item->dep (Dep::PREREQUIRES).begin(); it != item->dep (Dep::PREREQUIRES).end(); ++it) + for (CapSet::const_iterator it = prq.begin(); it != prq.end(); ++it) { - const Capability cap = *it; - requires.push_back(cap); + requires.push_back(*it); } + // Product requirements are ignored to assert Product gets installed + // as early as possible. Some stuff depends on it (e.g. registration). if ( ! isKind<Product>( item.resolvable() ) ) { for (CapSet::const_iterator it = item->dep (Dep::REQUIRES).begin(); it != item->dep (Dep::REQUIRES).end(); ++it) { - const Capability cap = *it; - requires.push_back(cap); + requires.push_back(*it); } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0