From 3fcf6bc4d3ac9205b113555d017f069d08de60a8 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Wed, 19 Jul 2017 01:56:58 +0200 Subject: [PATCH] server: Remove -F option to ls. Quoting the current help text of the option: This option is the default, so it does nothing. Deprecated as of v0.6.0, scheduled for removal in v0.6.1. This patch gets rid of the option and also adjusts the test suite, which still used it. --- NEWS.md | 2 ++ m4/lls/server_cmd.suite.m4 | 7 ------- t/t0004-server.sh | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/NEWS.md b/NEWS.md index 894922f8..05400a90 100644 --- a/NEWS.md +++ b/NEWS.md @@ -12,6 +12,8 @@ current master branch - The doxygen source browser has been disabled temporarily. The API reference is still online, though. - Overhaul of the source code documentation. +- The deprecated --full-path option of the ls command has been + removed. It was a no-op since 0.6.0. ------------------------------- 0.6.0 (2017-04-28) "fuzzy flux" diff --git a/m4/lls/server_cmd.suite.m4 b/m4/lls/server_cmd.suite.m4 index 5ac7f16a..2145c516 100644 --- a/m4/lls/server_cmd.suite.m4 +++ b/m4/lls/server_cmd.suite.m4 @@ -219,13 +219,6 @@ aux_info_prefix = Permissions: also given), chunk time and chunk offsets. [/help] - [option full-path] - short_opt = F - summary = list full paths, match full paths against patterns - [help] - This option is the default, so it does nothing. Deprecated as of - v0.6.0, scheduled for removal in v0.6.1. - [/help] [option basename] short_opt = b summary = list and match basenames only diff --git a/t/t0004-server.sh b/t/t0004-server.sh index 5329ef0f..6a8e5bf1 100755 --- a/t/t0004-server.sh +++ b/t/t0004-server.sh @@ -69,7 +69,7 @@ bad[$i]='.' let i++ commands[$i]="ls" required_objects[$i]='ogg_afh' -cmdline[$i]="ls -l=v -F ${oggs[@]}" +cmdline[$i]="ls -l=v ${oggs[@]}" good[$i]='^attributes_txt: 33' let i++ -- 2.39.2