Author: jkupec Date: Mon Sep 15 12:21:04 2008 New Revision: 11065 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11065&view=rev Log: - fixed --loose-auth and --loose-query for removerepo Modified: trunk/zypper/src/repos.cc Modified: trunk/zypper/src/repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.cc?rev=11065&r1=11064&r2=11065&view=diff ============================================================================== --- trunk/zypper/src/repos.cc (original) +++ trunk/zypper/src/repos.cc Mon Sep 15 12:21:04 2008 @@ -290,13 +290,38 @@ try { - if (known_it->alias() == str || - tmp == number || - find(known_it->baseUrlsBegin(),known_it->baseUrlsEnd(),Url(str)) - != known_it->baseUrlsEnd()) + if (known_it->alias() == str || tmp == number) + found = true; + if (!found) + { + url::ViewOption urlview = url::ViewOption::DEFAULTS + url::ViewOption::WITH_PASSWORD; + if (copts.count("loose-auth")) + { + urlview = urlview + - url::ViewOptions::WITH_PASSWORD + - url::ViewOptions::WITH_USERNAME; + } + if (copts.count("loose-query")) + urlview = urlview - url::ViewOptions::WITH_QUERY_STR; + + if (!(urlview.has(url::ViewOptions::WITH_PASSWORD) + && urlview.has(url::ViewOptions::WITH_QUERY_STR))) + { + for_(urlit, known_it->baseUrlsBegin(), known_it->baseUrlsEnd()) + if (urlit->asString(urlview) == Url(str).asString(urlview)) + { + found = true; + break; + } + } + else + found = + find(known_it->baseUrlsBegin(),known_it->baseUrlsEnd(),Url(str)) + != known_it->baseUrlsEnd(); + } + if (found) { *repo = *known_it; - found = true; break; } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org