Author: jkupec Date: Sun Apr 27 15:07:03 2008 New Revision: 9840 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9840&view=rev Log: - this was probably too much, no need to keep the sets mutually exclusive, instead show arch/vendor changes in addition to the ones listed in upgrade/downgrade/reinstall summary 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=9840&r1=9839&r2=9840&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Sun Apr 27 15:07:03 2008 @@ -843,9 +843,7 @@ typedef enum { TO_UPGRADE, - TO_UPGRADE_CHANGE_ARCH, TO_DOWNGRADE, - TO_DOWNGRADE_CHANGE_ARCH, TO_INSTALL, TO_REINSTALL, TO_REMOVE, @@ -862,12 +860,6 @@ case TO_DOWNGRADE: cout << "<" << (end ? "/" : "") << "to-downgrade>" << endl; break; - case TO_UPGRADE_CHANGE_ARCH: - cout << "<" << (end ? "/" : "") << "to-upgrade-change-arch>" << endl; - break; - case TO_DOWNGRADE_CHANGE_ARCH: - cout << "<" << (end ? "/" : "") << "to-downgrade-change-arch>" << endl; - break; case TO_INSTALL: cout << "<" << (end ? "/" : "") << "to-install>" << endl; break; @@ -954,28 +946,6 @@ "The following products are going to be upgraded:", it->second.size()); break; - case TO_UPGRADE_CHANGE_ARCH: - if (it->first == ResKind::package) - title = _PL( - "The following package is going to be upgraded and change architecture:", - "The following packages are going to be upgraded and change architecture:", - it->second.size()); - else if (it->first == ResKind::patch) - title = _PL( - "The following patch is going to be upgraded and change architecture:", - "The following patches are going to be upgraded and change architecture:", - it->second.size()); - else if (it->first == ResKind::pattern) - title = _PL( - "The following pattern is going to be upgraded and change architecture:", - "The following patterns are going to be upgraded and change architecture:", - it->second.size()); - else if (it->first == ResKind::product) - title = _PL( - "The following product is going to be upgraded and change architecture:", - "The following products are going to be upgraded and change architecture:", - it->second.size()); - break; case TO_DOWNGRADE: if (it->first == ResKind::package) title = _PL( @@ -998,28 +968,6 @@ "The following products are going to be downgraded:", it->second.size()); break; - case TO_DOWNGRADE_CHANGE_ARCH: - if (it->first == ResKind::package) - title = _PL( - "The following package is going to be downgraded and change architecture:", - "The following packages are going to be downgraded and change architecture:", - it->second.size()); - else if (it->first == ResKind::patch) - title = _PL( - "The following patch is going to be downgraded and change architecture:", - "The following patches are going to be downgraded and change architecture:", - it->second.size()); - else if (it->first == ResKind::pattern) - title = _PL( - "The following pattern is going to be downgraded and change architecture:", - "The following patterns are going to be downgraded and change architecture:", - it->second.size()); - else if (it->first == ResKind::product) - title = _PL( - "The following product is going to be downgraded and change architecture:", - "The following products are going to be downgraded and change architecture:", - it->second.size()); - break; case TO_INSTALL: if (it->first == ResKind::package) title = _PL( @@ -1199,8 +1147,6 @@ KindToResObjectSet toinstall; KindToResObjectSet toupgrade; KindToResObjectSet todowngrade; - KindToResObjectSet toupgrade_charch; - KindToResObjectSet todowngrade_charch; KindToResObjectSet toreinstall; KindToResObjectSet toremove; KindToResObjectSet tochangearch; @@ -1225,24 +1171,21 @@ { if (res->edition() > (*rmit)->edition()) { - if (res->arch() == (*rmit)->arch()) - toupgrade[res->kind()].insert(res); - else - toupgrade_charch[res->kind()].insert(res); + toupgrade[res->kind()].insert(res); + if (res->arch() != (*rmit)->arch()) + tochangearch[res->kind()].insert(res); } else if (res->edition() == (*rmit)->edition()) { - if (res->arch() == (*rmit)->arch()) - toreinstall[res->kind()].insert(res); - else + toreinstall[res->kind()].insert(res); + if (res->arch() != (*rmit)->arch()) tochangearch[res->kind()].insert(res); } else { - if (res->arch() == (*rmit)->arch()) - todowngrade[res->kind()].insert(res); - else - todowngrade_charch[res->kind()].insert(res); + todowngrade[res->kind()].insert(res); + if (res->arch() != (*rmit)->arch()) + tochangearch[res->kind()].insert(res); } new_installed_size += res->installsize() - (*rmit)->installsize(); @@ -1304,8 +1247,6 @@ // show summary show_summary_of_type(zypper, TO_UPGRADE, toupgrade); show_summary_of_type(zypper, TO_DOWNGRADE, todowngrade); - show_summary_of_type(zypper, TO_UPGRADE_CHANGE_ARCH, toupgrade_charch); - show_summary_of_type(zypper, TO_DOWNGRADE_CHANGE_ARCH, todowngrade_charch); show_summary_of_type(zypper, TO_INSTALL, toinstall); show_summary_of_type(zypper, TO_REINSTALL, toreinstall); show_summary_of_type(zypper, TO_REMOVE, toremove); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org