Author: dmacvicar Date: Tue May 20 15:19:50 2008 New Revision: 10166 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10166&view=rev Log: - fix zypper looping when arguments are parsed as capabilities. (bnc#391644) Modified: trunk/zypper/package/zypper.changes trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?rev... ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Tue May 20 15:19:50 2008 @@ -18,6 +18,12 @@ - r10152 ------------------------------------------------------------------- +Tue May 20 15:18:36 CEST 2008 - dmacvicar@suse.de + +- fix zypper looping when arguments are parsed as + capabilities. (bnc#391644) + +------------------------------------------------------------------- Fri May 16 12:06:54 CEST 2008 - jreidinger@suse.cz - correctly report when libzypp cannot lock due to error instead of Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=101... ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Tue May 20 15:19:50 2008 @@ -501,6 +501,18 @@ continue; } + // recognize missplaced command line options given as packages + // bnc#391644 + if ( str[0] == '-' ) + { + // FIXME show a message here, after string freeze + //zypper.out().error(boost::str(format(_("%s is not a valid package or capability name.") % str)); + zypper.out().error(_("No valid arguments specified.")); + zypper.setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); + ZYPP_THROW(ExitRequestException()); + } + + // is version specified? by_capability = str.find_first_of("=<>") != string::npos; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org