saltstack/salt — pull request #9133 by terminalmage (2013-12-10 01:28:22+00:00)
Title: Fix bug in pkgrepo when switching to/from mirrorlist-based repo def

This adds a check to ensure that both of mirrorlist and baseurl aren't
specified, and also deletes mirrorlist when baseurl is specified (and
vice-versa). Additionally, rather than returning a string containing
errors when they are encountered, raise an exception instead.

Fixes #9121.