subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1688426 - in /subversion/trunk/subversion: svnadmin/svnadmin.c tests/cmdline/svnadmin_tests.py
Date Tue, 30 Jun 2015 11:13:29 GMT
Author: stefan2
Date: Tue Jun 30 11:13:29 2015
New Revision: 1688426

URL: http://svn.apache.org/r1688426
Log:
Follow-up to r1688270:
Prefix the warning with "svnadmin: " as we do everywhere else.

Suggested by: danielsh

* subversion/svnadmin/svnadmin.c
  (repos_notify_handler): Prefix warning output.

* subversion/tests/cmdline/svnadmin_tests.py
  (fsfs_pack_non_sharded): Update expectation.

Modified:
    subversion/trunk/subversion/svnadmin/svnadmin.c
    subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py

Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1688426&r1=1688425&r2=1688426&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Tue Jun 30 11:13:29 2015
@@ -1134,8 +1134,8 @@ repos_notify_handler(void *baton,
       if (notify->shard == -1)
         {
           svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
-                                  _("Warning: This repository is not sharded."
-                                    " Packing has no effect.\n")));
+                     _("svnadmin: Warning - this repository is not sharded."
+                       " Packing has no effect.\n")));
         }
       return;
 

Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1688426&r1=1688425&r2=1688426&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Tue Jun 30 11:13:29 2015
@@ -3079,7 +3079,7 @@ def fsfs_pack_non_sharded(sbox):
   svntest.actions.run_and_verify_svnadmin(
       None, [], "upgrade", sbox.repo_dir)
   svntest.actions.run_and_verify_svnadmin(
-      ['Warning: This repository is not sharded. Packing has no effect.\n'],
+      ['svnadmin: Warning - this repository is not sharded. Packing has no effect.\n'],
       [], "pack", sbox.repo_dir)
 
 ########################################################################



Mime
View raw message