Codebase list distro-info / 2e33ea7
Improve error message if the given distribution series is unknown. Benjamin Drung 9 years ago
3 changed file(s) with 31 addition(s) and 3 deletion(s). Raw diff Collapse all Expand all
+6
-2
distro-info-util.c less more
874874 if(select_cb == NULL && !series_name) {
875875 filter_data(distro_list, date, date_index, just_days, filter_cb, print_cb);
876876 } else {
877 if (series_name) {
877 if(series_name) {
878878 selected = select_series(distro_list, series_name);
879879 } else {
880880 selected = get_distro(distro_list, date, filter_cb, select_cb);
885885 #endif
886886 }
887887 if(selected == NULL) {
888 fprintf(stderr, NAME ": " OUTDATED_ERROR "\n");
888 if(series_name) {
889 fprintf(stderr, NAME ": unknown distribution series `%s'\n", series_name);
890 } else {
891 fprintf(stderr, NAME ": " OUTDATED_ERROR "\n");
892 }
889893 return_value = EXIT_FAILURE;
890894 } else {
891895 if(!print_cb(selected, date, date_index, just_days)) {
+13
-0
test-debian-distro-info less more
218218 failure "--date=2010-02-30 -d" "debian-distro-info: invalid date \`2010-02-30'"
219219 }
220220
221 testInvalidSeries() {
222 failure "--series wr0ng" "debian-distro-info: invalid distribution series \`wr0ng'"
223 }
224
225
221226 testMultipleAlias() {
222227 failure "--alias a --alias b" "debian-distro-info: --alias requested multiple times."
223228 }
224229
225230 testMultipleDates() {
226231 failure "--date 2007-06-05 -s --date 2004-03-02" "debian-distro-info: Date specified multiple times."
232 }
233
234 testMultipleSeries() {
235 failure "--series wheezy --series jessie" "debian-distro-info: series requested multiple times."
236 }
237
238 testUnknownSeries() {
239 failure "--series foobar" "debian-distro-info: unknown distribution series \`foobar'"
227240 }
228241
229242 testDays() {
+12
-1
test-ubuntu-distro-info less more
221221 failure "--date ${future_year}-10-03 -s" "ubuntu-distro-info: $outdated_e"
222222 failure "--date ${future_year}-10-03 -d" "ubuntu-distro-info: $outdated_e"
223223 failure "--date ${future_year}-10-03 -l" "ubuntu-distro-info: $outdated_e"
224 failure "--series foobar" "ubuntu-distro-info: $outdated_e"
225224 }
226225
227226 testInvalidDate() {
229228 failure "--date=2010-02-30 -d" "ubuntu-distro-info: invalid date \`2010-02-30'"
230229 }
231230
231 testInvalidSeries() {
232 failure "--series wr0ng" "ubuntu-distro-info: invalid distribution series \`wr0ng'"
233 }
234
232235 testMultipleDates() {
233236 failure "--date 2007-06-05 -s --date 2004-03-02" "ubuntu-distro-info: Date specified multiple times."
237 }
238
239 testMultipleSeries() {
240 failure "--series trusty --series utopic" "ubuntu-distro-info: series requested multiple times."
241 }
242
243 testUnknownSeries() {
244 failure "--series foobar" "ubuntu-distro-info: unknown distribution series \`foobar'"
234245 }
235246
236247 testDays() {