Changeset 1097 for trunk

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:

• Configuration.cc (modified) (2 diffs)
• File.cc (modified) (3 diffs)
• utility.cc (modified) (1 diff)

trunk/lib/Configuration.cc

@@ -368 +368 @@
     if (!regexp(str.begin(), str.end(), dic.first.begin(),dic.first.end(),vec)){
       std::stringstream mess;
-      mess << "svndigest: invalid config file: "
+      mess << "invalid config file: "
            << "expression " << dic.first << " is invalid";
       throw std::runtime_error(mess.str());       
@@ -380 +380 @@
         if (n>vec.size() || n==0){
           std::stringstream mess;
-          mess << "svndigest: invalid config file: "
+          mess << "invalid config file: "
                << "expression " << dic.second << " is invalid";
           if (n)

trunk/lib/File.cc

@@ -108 +108 @@
             Alias a(*a_iter,alias.size());
             year_authors[rev_iter->first].insert(a);
-            std::cerr << "svndigest: warning: no copyright alias found for `" 
+            std::cerr << "svncopyright: warning: no copyright alias found for `" 
                       << *a_iter << "'\n";
             // insert alias to avoid multiple warnings.
@@ -335 +335 @@
     if (!detect_copyright(old_block, start_line, end_line, prefix)){
       if (Configuration::instance().missing_copyright_warning())
-        std::cerr << "svndigest: warning: no copyright statement found in `" 
+        std::cerr << "svncopyright: warning: no copyright statement found in `" 
                   << path_ << "'\n";
       return;
@@ -450 +450 @@
     catch (std::runtime_error e) {
       // catch exception, cleanup, and rethrow
-      std::cerr << "svndigest: File::print_copyright: Exception caught, "
+      std::cerr << "svncopyright: File::print_copyright: Exception caught, "
                 << "removing temporary file " << tmpname << std::endl;
       if (unlink(tmpname))

trunk/lib/utility.cc

@@ -163 +163 @@
     if (res!=FNM_NOMATCH) {
       std::stringstream ss;
-      ss << "svndigest: fnmatch with args: " << pattern << ", " << str;
+      ss << "fnmatch with args: " << pattern << ", " << str;
       throw std::runtime_error(ss.str());
     }