# # patch "ChangeLog" # from [26305160a92dfbbf2482ee4f429709c9a4e63ed9] # to [e3312f9e4eda04bb1e456a9da9d6a907a7789f80] # # patch "database.cc" # from [0bd7261d373d66e417e0e457a815db7bd4fb7e6c] # to [1461c43255cf406cfc2d4425184fd0a3e0556679] # ======================================================================== --- ChangeLog 26305160a92dfbbf2482ee4f429709c9a4e63ed9 +++ ChangeLog e3312f9e4eda04bb1e456a9da9d6a907a7789f80 @@ -1,5 +1,10 @@ 2005-08-25 Nathaniel Smith + * database.cc (sql): Only check schema version when db actually + exists. + +2005-08-25 Nathaniel Smith + * file_io.cc (read_data_for_command_line): We are given a system_path. ======================================================================== --- database.cc 0bd7261d373d66e417e0e457a815db7bd4fb7e6c +++ database.cc 1461c43255cf406cfc2d4425184fd0a3e0556679 @@ -173,11 +173,13 @@ N(!filename.empty(), F("no database specified")); if (! init) - require_path_is_file(filename, - F("database %s does not exist") % filename, - F("%s is a directory, not a database") % filename); + { + require_path_is_file(filename, + F("database %s does not exist") % filename, + F("%s is a directory, not a database") % filename); - check_sqlite_format_version(filename); + check_sqlite_format_version(filename); + } int error; error = sqlite3_open(filename.as_external().c_str(), &__sql); if (error)