[Bps-public-commit] SD branch, master, updated. d2db62d588d3e79ce780ca8016b464f5140796e8

[jesse]

The branch, master has been updated
       via  d2db62d588d3e79ce780ca8016b464f5140796e8 (commit)
      from  a58dbab3feff23e506d1c818673a24994e43f85a (commit)

Summary of changes:
 lib/App/SD/Config.pm       |    2 +-
 t/05-config-file-loading.t |    4 ++--
 t/06-ticket-show.t         |    2 +-
 t/07-sort-group.t          |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit d2db62d588d3e79ce780ca8016b464f5140796e8
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Apr 15 15:57:39 2009 +0800

    finish config file rename

diff --git a/lib/App/SD/Config.pm b/lib/App/SD/Config.pm
index 616b738..8892c3e 100644
--- a/lib/App/SD/Config.pm
+++ b/lib/App/SD/Config.pm
@@ -12,7 +12,7 @@ sub app_config_file {
     my $self = shift;
 
     # The order of preference for config files is:
-    #   $ENV{SD_CONFIG} > fs_root/sdrc > fs_root/prophetrc (for backcompat)
+    #   $ENV{SD_CONFIG} > fs_root/config > fs_root/prophetrc (for backcompat)
     #   $HOME/.sdrc > $ENV{PROPHET_APP_CONFIG} > $HOME/.prophetrc
 
     $ENV{'PROPHET_APP_CONFIG'}
diff --git a/t/05-config-file-loading.t b/t/05-config-file-loading.t
index 9613cf7..e40a7d3 100644
--- a/t/05-config-file-loading.t
+++ b/t/05-config-file-loading.t
@@ -94,9 +94,9 @@ run_output_matches( 'sd', [ 'ticket',
     [ qr/\s+(\d+) } new        YATTA/]
 );
 
-diag("Testing fs_root/sdrc\n");
+diag("Testing fs_root/config\n");
 
-$config_filename = $ENV{'SD_REPO'} . '/sdrc';
+$config_filename = $ENV{'SD_REPO'} . '/config';
 
 App::SD::Test->write_to_file($config_filename,
     "summary_format_ticket = %4s },\$luid | %-6.6s,status | %-60.60s,summary\n");
diff --git a/t/06-ticket-show.t b/t/06-ticket-show.t
index 0be82b7..03a1c4e 100644
--- a/t/06-ticket-show.t
+++ b/t/06-ticket-show.t
@@ -92,7 +92,7 @@ diag("passing --skip history (doesn't show history)");
 
 check_output_without_history('--skip-history');
 
-my $config_filename = $ENV{'SD_REPO'} . '/sdrc';
+my $config_filename = $ENV{'SD_REPO'} . '/config';
 App::SD::Test->write_to_file($config_filename,
     "disable_ticket_show_history_by_default = 1\n");
 $ENV{'SD_CONFIG'} = $config_filename;
diff --git a/t/07-sort-group.t b/t/07-sort-group.t
index 16a3842..952247e 100644
--- a/t/07-sort-group.t
+++ b/t/07-sort-group.t
@@ -39,7 +39,7 @@ run_output_matches( 'sd', [ 'ticket', 'list', '--sort', 'owner' ],
     ]
 );
 
-my $config_filename = $ENV{'SD_REPO'} . '/sdrc';
+my $config_filename = $ENV{'SD_REPO'} . '/config';
 App::SD::Test->write_to_file($config_filename,
     "default_sort_ticket_list = owner\n");
 $ENV{'SD_CONFIG'} = $config_filename;
@@ -83,7 +83,7 @@ run_output_matches( 'sd', [ 'ticket', 'list', '--group', 'owner' ],
 );
 
 diag('using default_group_ticket_list = owner');
-$config_filename = $ENV{'SD_REPO'} . '/sdrc';
+$config_filename = $ENV{'SD_REPO'} . '/config';
 App::SD::Test->write_to_file($config_filename,
     "default_group_ticket_list = owner\n");
 $ENV{'SD_CONFIG'} = $config_filename;

-----------------------------------------------------------------------