Author: jreidinger Date: Fri Apr 25 17:12:28 2008 New Revision: 9823 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9823&view=rev Log: add richtext support also in license confirmation 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=9823&r1=9822&r2=9823&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Fri Apr 25 17:12:28 2008 @@ -26,6 +26,7 @@ #include "zypper-main.h" #include "zypper-utils.h" #include "zypper-getopt.h" +#include "zypper-richtext.h" #include "zypper-prompt.h" #include "output/prompt.h" @@ -2335,8 +2336,12 @@ // license text ostringstream s; s << format(_("%s %s license:")) % it->resolvable()->name() - % kind_to_string_localized(it->resolvable()->kind(), 1) - << it->resolvable()->licenseToConfirm(); + % kind_to_string_localized(it->resolvable()->kind(), 1); + const string& licenseText = it->resolvable()->licenseToConfirm(); + if (licenseText.find("DT:Rich")==licenseText.npos) + s << licenseText; + else + s << processRichText(licenseText); zypper.out().info(s.str(), Out::QUIET); // lincense prompt -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org