Author: jkupec Date: Sun Nov 4 11:05:27 2007 New Revision: 7738 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7738&view=rev Log: - decoupling zypper and zypp-checkpatches code Modified: trunk/zypper/src/zypp-checkpatches.cc trunk/zypper/src/zypper-updates.cc trunk/zypper/src/zypper-updates.h trunk/zypper/src/zypper.h Modified: trunk/zypper/src/zypp-checkpatches.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypp-checkpatches.cc?rev=7738&r1=7737&r2=7738&view=diff ============================================================================== --- trunk/zypper/src/zypp-checkpatches.cc (original) +++ trunk/zypper/src/zypp-checkpatches.cc Sun Nov 4 11:05:27 2007 @@ -37,6 +37,7 @@ ZYpp::Ptr God; RuntimeData gData; Settings gSettings; +std::list<Error> errors; ostream no_stream(NULL); @@ -89,7 +90,7 @@ int exit_with_error( const std::string &error_str ) { - gData.errors.push_back(Error(error_str)); + errors.push_back(Error(error_str)); std::ofstream os(RESULT_FILE); if ( os.good() ) @@ -181,7 +182,7 @@ { // TranslatorExplanation %s = detailed low level (unstranslated) error message string error = excpt_r.msg(); - gData.errors.push_back(str::form(_("Couldn't restore repository.\nDetail: %s"), error.c_str())); + errors.push_back(str::form(_("Couldn't restore repository.\nDetail: %s"), error.c_str())); } } @@ -231,7 +232,7 @@ if ( gData.repos.size() == 0 ) { - gData.errors.push_back( str::form( _( "There are no update repositories defined. Please add one or more update repositories in order to be notified of updates.") ) ); + errors.push_back( str::form( _( "There are no update repositories defined. Please add one or more update repositories in order to be notified of updates.") ) ); } God->addResolvables( God->target()->resolvables(), true); Modified: trunk/zypper/src/zypper-updates.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-updates.cc?rev=7738&r1=7737&r2=7738&view=diff ============================================================================== --- trunk/zypper/src/zypper-updates.cc (original) +++ trunk/zypper/src/zypper-updates.cc Sun Nov 4 11:05:27 2007 @@ -25,6 +25,7 @@ extern ZYpp::Ptr God; extern RuntimeData gData; extern Settings gSettings; +extern std::list<Error> errors; Edition read_old_version() { @@ -59,7 +60,7 @@ out << "<?xml version='1.0'?>" << std::endl; out << "" << std::endl; out << " <errors>" << std::endl; - for ( std::list<Error>::const_iterator it = gData.errors.begin(); it != gData.errors.end(); ++it ) + for ( std::list<Error>::const_iterator it = errors.begin(); it != errors.end(); ++it ) { out << " <error>" << xml_escape(it->description) << "</error>" << endl; } @@ -77,7 +78,7 @@ //out << " " << std::endl; out << " <errors>" << std::endl; - for ( std::list<Error>::const_iterator it = gData.errors.begin(); it != gData.errors.end(); ++it ) + for ( std::list<Error>::const_iterator it = errors.begin(); it != errors.end(); ++it ) { out << " <error>" << xml_escape(it->description) << "</error>" << endl; } Modified: trunk/zypper/src/zypper-updates.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-updates.h?rev=7738&r1=7737&r2=7738&view=diff ============================================================================== --- trunk/zypper/src/zypper-updates.h (original) +++ trunk/zypper/src/zypper-updates.h Sun Nov 4 11:05:27 2007 @@ -19,6 +19,16 @@ #define XML_FILE_VERSION "/var/lib/zypp/cache/updates_xml_version" #define RESULT_FILE "/var/lib/zypp/cache/updates_result.xml" +struct Error +{ + Error( const std::string &desc ) + : description(desc) + {} + std::string description; +}; + +extern std::list<Error> errors; + std::string read_old_token(); void save_token( const std::string &token ); zypp::Edition read_old_version(); Modified: trunk/zypper/src/zypper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=7738&r1=7737&r2=7738&view=diff ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/zypper.h Sun Nov 4 11:05:27 2007 @@ -21,7 +21,6 @@ #define ZYPP_CHECKPATCHES_LOG "/var/log/zypper.log" #undef ZYPP_BASE_LOGGER_LOGGROUP #define ZYPP_BASE_LOGGER_LOGGROUP "zypper" -#define RANDOM_TOKEN "sad987432JJDJD948394DDDxxx22" // ===== exit codes ====== @@ -46,7 +45,7 @@ struct Settings { Settings() - : previous_token(RANDOM_TOKEN), + : verbosity(0), previous_code(-1), disable_system_sources(false), @@ -60,7 +59,6 @@ {} std::listzypp::Url additional_sources; - std::string previous_token; /** * Level of the amount of output. @@ -86,21 +84,12 @@ zypp::RepoManagerOptions rm_options; }; -struct Error -{ - Error( const std::string &desc ) - : description(desc) - {} - std::string description; -}; - struct RuntimeData { RuntimeData() : patches_count(0), security_patches_count(0), show_media_progress_hack(false) {} - std::list<Error> errors; std::listzypp::RepoInfo repos; int patches_count; int security_patches_count; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org