Changeset 1097 for trunk


Ignore:
Timestamp:
Jun 13, 2010, 5:23:43 AM (11 years ago)
Author:
Peter Johansson
Message:

avoid string 'svndigest: ' in exception message as we print 'svndigest: e.what()' in main. Also change svndigest to svncopyright in copyright warnings.

Location:
trunk/lib
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/Configuration.cc

    r1090 r1097  
    368368    if (!regexp(str.begin(), str.end(), dic.first.begin(),dic.first.end(),vec)){
    369369      std::stringstream mess;
    370       mess << "svndigest: invalid config file: "
     370      mess << "invalid config file: "
    371371           << "expression " << dic.first << " is invalid";
    372372      throw std::runtime_error(mess.str());       
     
    380380        if (n>vec.size() || n==0){
    381381          std::stringstream mess;
    382           mess << "svndigest: invalid config file: "
     382          mess << "invalid config file: "
    383383               << "expression " << dic.second << " is invalid";
    384384          if (n)
  • trunk/lib/File.cc

    r1024 r1097  
    108108            Alias a(*a_iter,alias.size());
    109109            year_authors[rev_iter->first].insert(a);
    110             std::cerr << "svndigest: warning: no copyright alias found for `"
     110            std::cerr << "svncopyright: warning: no copyright alias found for `"
    111111                      << *a_iter << "'\n";
    112112            // insert alias to avoid multiple warnings.
     
    335335    if (!detect_copyright(old_block, start_line, end_line, prefix)){
    336336      if (Configuration::instance().missing_copyright_warning())
    337         std::cerr << "svndigest: warning: no copyright statement found in `"
     337        std::cerr << "svncopyright: warning: no copyright statement found in `"
    338338                  << path_ << "'\n";
    339339      return;
     
    450450    catch (std::runtime_error e) {
    451451      // catch exception, cleanup, and rethrow
    452       std::cerr << "svndigest: File::print_copyright: Exception caught, "
     452      std::cerr << "svncopyright: File::print_copyright: Exception caught, "
    453453                << "removing temporary file " << tmpname << std::endl;
    454454      if (unlink(tmpname))
  • trunk/lib/utility.cc

    r1090 r1097  
    163163    if (res!=FNM_NOMATCH) {
    164164      std::stringstream ss;
    165       ss << "svndigest: fnmatch with args: " << pattern << ", " << str;
     165      ss << "fnmatch with args: " << pattern << ", " << str;
    166166      throw std::runtime_error(ss.str());
    167167    }                     
Note: See TracChangeset for help on using the changeset viewer.