Do some basic compatibility checking when installing a new server

[disorder] / server / choose.c

diff --git a/server/choose.c b/server/choose.c
index a4bf443af44514276d735d3568f446b6606ab1a1..10ed360d962ad22113ea41418e029211c1cc1a02 100644 (file)
--- a/server/choose.c
+++ b/server/choose.c
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/** @file choose.c
+/** @file server/choose.c
  * @brief Random track chooser
  *
  * Picks a track at random and writes it to standard output.  If for
@@ -281,7 +281,7 @@ int main(int argc, char **argv) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }
-  if(config_read(0)) fatal(0, "cannot read configuration");
+  if(config_read(0, NULL)) fatal(0, "cannot read configuration");
   /* Find out current queue/recent list */
   queue_read();
   recent_read();
@@ -295,8 +295,10 @@ int main(int argc, char **argv) {
   if((err = trackdb_get_global_tid("prohibited-tags", global_tid, &tags)))
     fatal(0, "error getting prohibited-tags: %s", db_strerror(err));
   prohibited_tags = parsetags(tags);
-  if(trackdb_scan(0, collect_tracks_callback, 0, global_tid))
+  if(trackdb_scan(0, collect_tracks_callback, 0, global_tid)) {
+    global_tid->abort(global_tid);
     exit(1);
+  }
   trackdb_commit_transaction(global_tid);
   trackdb_close();
   trackdb_deinit();