summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/hafas-m15
-rw-r--r--lib/Travel/Status/DE/HAFAS.pm2
2 files changed, 15 insertions, 2 deletions
diff --git a/bin/hafas-m b/bin/hafas-m
index 40f125b..a6899b0 100755
--- a/bin/hafas-m
+++ b/bin/hafas-m
@@ -64,7 +64,8 @@ if ($list_services) {
'time zone'
);
for my $service ( Travel::Status::DE::HAFAS::get_services() ) {
- if ($service->{shortname} eq 'DB') {
+ if ( $service->{shortname} eq 'DB' ) {
+
# HTTP 503 Service Unavailable
next;
}
@@ -78,6 +79,18 @@ if ($list_services) {
exit 0;
}
+if ( not $service ) {
+ say STDERR 'Note: You have called hafas-m without specifying a service.';
+ say STDERR q{};
+ say STDERR 'Unfortunately, the previous default service (DB HAFAS)';
+ say STDERR 'is no more, and there is no generic replacement available.';
+ say STDERR q{};
+ say STDERR 'Please use "hafas-m --list" to list supported services,';
+ say STDERR 'and then select one via -s <service>.';
+ say STDERR 'Falling back to ÖBB for now.';
+ $service = 'ÖBB';
+}
+
if ($use_cache) {
my $cache_path = ( $ENV{XDG_CACHE_HOME} // "$ENV{HOME}/.cache" )
. '/Travel-Status-DE-HAFAS';
diff --git a/lib/Travel/Status/DE/HAFAS.pm b/lib/Travel/Status/DE/HAFAS.pm
index e71e9f0..c2f05e5 100644
--- a/lib/Travel/Status/DE/HAFAS.pm
+++ b/lib/Travel/Status/DE/HAFAS.pm
@@ -60,7 +60,7 @@ sub new {
}
if ( not defined $service ) {
- $service = $conf{service} = 'DB';
+ confess("You must specify a service");
}
if ( defined $service and not exists $hafas_instance->{$service} ) {