Project

General

Profile

Bug #21664

Bring back diff -y for non-FreeBSD

Added by David Zafman over 1 year ago. Updated 11 months ago.

Status:
Resolved
Priority:
Normal
Assignee:
Category:
-
Target version:
-
Start date:
10/03/2017
Due date:
% Done:

0%

Source:
Tags:
Backport:
luminous, mimic
Regression:
No
Severity:
3 - minor
Reviewed:
Affected Versions:
ceph-qa-suite:
Pull request ID:

Description

Create a diff function in ceph-helpers.sh for osd-scrub-repair.sh and osd-scrub-snaps.sh that will output both a diff and a diff -y if appropriate when there are differences.


Related issues

Copied to Ceph - Backport #24738: mimic: Bring back diff -y for non-FreeBSD Resolved
Copied to Ceph - Backport #24739: luminous: Bring back diff -y for non-FreeBSD Resolved

History

#1 Updated by David Zafman over 1 year ago

This was the code removed by Sage

if [ `uname` = FreeBSD ]; then
      SED=gsed
 -    DIFFCOLOPTS="" 
      KERNCORE="kern.corefile" 
  else
      SED=sed
 -    termwidth=$(stty -a | head -1 | sed -e 's/.*columns \([0-9]*\).*/\1/')
 -    if [ -n "$termwidth" -a "$termwidth" != "0" ]; then
 -        termwidth="-W ${termwidth}" 
 -    fi
 -    DIFFCOLOPTS="-y $termwidth" 
      KERNCORE="kernel.core_pattern" 
  fi

#3 Updated by David Zafman 12 months ago

  • Status changed from New to Need Review

#4 Updated by David Zafman 12 months ago

  • Backport set to luminous, mimic

#5 Updated by David Zafman 12 months ago

  • Status changed from Need Review to Pending Backport

#6 Updated by Nathan Cutler 12 months ago

  • Copied to Backport #24738: mimic: Bring back diff -y for non-FreeBSD added

#7 Updated by Nathan Cutler 12 months ago

  • Copied to Backport #24739: luminous: Bring back diff -y for non-FreeBSD added

#9 Updated by David Zafman 11 months ago

  • Status changed from Pending Backport to Resolved

Also available in: Atom PDF