Roxen.git/ server/ base_server/ module.pike

2005-10-06

2005-10-06 12:43:31 by Marcus Wellhardh <wellhard@roxen.com>

• 28928d8ee4ff299836c3c8f5d87de3c993738515 (13 lines) (+7/-6) ^{[ Show | Annotate ]}
  Branch: 5.2

Improved error message when module_dependencies where called without configuration.

Rev: server/base_server/module.pike:1.222

1:   // This file is part of Roxen WebServer.   // Copyright © 1996 - 2004, Roxen IS. - // $Id: module.pike,v 1.221 2005/10/05 14:47:51 mast Exp $ + // $Id: module.pike,v 1.222 2005/10/06 12:43:31 wellhard Exp $      #include <module_constants.h>   #include <module.h>
124:    });    Configuration conf = configuration || my_configuration();    if (!conf) -  report_warning ("Configuration not resolved; module(s) %s%s " -  "weren't added.", -  String.implode_nicely (modules), -  module_identifier() ? -  " that " + module_identifier() + " depend on" : ""); +  report_warning ("Configuration not resolved; module(s) %s that %O " +  "depend on weren't added.\n", String.implode_nicely (modules), +  module_identifier() || +  master()->describe_program(this_program) || +  "unknown module");    else    conf->add_modules( modules, now );    return 1;