Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sort.py updates #3985

Merged
merged 6 commits into from
Feb 17, 2021
Merged

Sort.py updates #3985

merged 6 commits into from
Feb 17, 2021

Conversation

rusty-snake
Copy link
Collaborator

0f76e53 sort.py: Better error message
19c92f2 sort.py: Print the fixed line when running in a CI
9f939b8 workflows/sort.yml: Run also if sort.py is changed

@lgtm-com
Copy link

lgtm-com bot commented Feb 13, 2021

This pull request fixes 1 alert when merging 462c5d9 into 4b2914e - view on LGTM.com

fixed alerts:

  • 1 for Except block handles 'BaseException'

@rusty-snake rusty-snake marked this pull request as ready for review February 13, 2021 20:10
@lgtm-com
Copy link

lgtm-com bot commented Feb 13, 2021

This pull request fixes 1 alert when merging 9f939b8 into 4b2914e - view on LGTM.com

fixed alerts:

  • 1 for Except block handles 'BaseException'

contrib/sort.py Outdated Show resolved Hide resolved
@lgtm-com
Copy link

lgtm-com bot commented Feb 14, 2021

This pull request fixes 1 alert when merging e9ec31a into 76efbaf - view on LGTM.com

fixed alerts:

  • 1 for Except block handles 'BaseException'

Copy link
Collaborator

@kmk3 kmk3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, I like the new diff-like output:

sort.py: checking 2 profiles...
etc/profile-a-l/ark.profile:39:-private-bin 7z,ark,bash,lrzip,lsar,lz4,lzop,p7zip,rar,sh,tclsh,unar,unrar,unzip,zip,zipinfo,aaa
etc/profile-a-l/ark.profile:39:+private-bin 7z,aaa,ark,bash,lrzip,lsar,lz4,lzop,p7zip,rar,sh,tclsh,unar,unrar,unzip,zip,zipinfo
[ Fixed ] etc/profile-a-l/ark.profile
etc/profile-m-z/mpv.profile:75:-private-bin env,mpv,python*,waf,youtube-dl,aaa
etc/profile-m-z/mpv.profile:75:+private-bin aaa,env,mpv,python*,waf,youtube-dl
[ Fixed ] etc/profile-m-z/mpv.profile

I have some more enhancement suggestions, but I'd rather finish writing them up
later / on a new thread.

Edit: I meant "on a new PR" rather than "on a new thread [here]". As in,
by me this is ready for merging.


By the way, this is the script that I used to generate/compare the outputs:

#!/bin/sh

set -e
set -- etc/profile-a-l/ark.profile etc/profile-m-z/mpv.profile

git checkout -- "$@"
sed -i.bak -e 's/^private-bin .*/&,aaa/' -- "$@"
./contrib/sort.py "$@"

Then, to clean up:

find etc/profile-* -name '*.bak' -exec rm '{}' +

contrib/sort.py Outdated Show resolved Hide resolved
@lgtm-com
Copy link

lgtm-com bot commented Feb 15, 2021

This pull request fixes 1 alert when merging f1121cf into 4ceee6f - view on LGTM.com

fixed alerts:

  • 1 for Except block handles 'BaseException'

@rusty-snake rusty-snake merged commit bdabc87 into netblue30:master Feb 17, 2021
@rusty-snake rusty-snake deleted the sort.py-updates branch February 17, 2021 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants