Skip to content

Commit

Permalink
Simple solution to issue #3413 Removing inserted blank lines from pag…
Browse files Browse the repository at this point in the history
…nated output (#3414)

* Simple solution to issue #3413 Removing_inserted_blank_lines_from_paginated_output

We make the lazy assumtion that when you can't turn off pagenation with something like "terminal length
0", that Dell always puts an undesirable blank line before the --More-- prompt. :-)

This will make diffs fail between TFTPd and oxidized copies of the same config.

* Update CHANGELOG.md

powerconnect: Remove undesirable inserted blank lines during pagination. Fixes #3413
  • Loading branch information
clifcox authored Feb 24, 2025
1 parent 26e6c68 commit bda276e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ This minor release fixes a javascript issue in oxidized-web, which is included
in the Docker container of oxidized.

### Fixed
- powerconnect: Remove undesirable inserted blank lines during pagination. Fixes #3413 (@clifcox)
- powerconnect: Hide enable, and line secrets. Further Fixes #1212 (#clifcox)


## [0.32.0 – 2025-02-17]
This release fixes a security issue in oxidized-web, which is included in the
Docker container of oxidized. If you are not using the Docker container but
Expand Down
2 changes: 1 addition & 1 deletion lib/oxidized/model/powerconnect.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class PowerConnect < Oxidized::Model

comment '! '

expect /^\s*--More--\s+.*$/ do |data, re|
expect /\n\s*--More--\s+.*/ do |data, re| # Also grab the blank line above the --More--
send ' '
data.sub re, ''
end
Expand Down

0 comments on commit bda276e

Please sign in to comment.