From 6d191405bee4f348877ec715bfe7e915e77bd189 Mon Sep 17 00:00:00 2001 From: brent s Date: Tue, 4 Dec 2018 10:52:34 -0500 Subject: [PATCH] fixing some vanilla centos 6 bullshit --- centos/list_files_package.py | 35 ++++++++++++++++++++++------------- net/irc/.gitignore | 1 + 2 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 net/irc/.gitignore diff --git a/centos/list_files_package.py b/centos/list_files_package.py index 5a9343a..cf6a5f5 100755 --- a/centos/list_files_package.py +++ b/centos/list_files_package.py @@ -4,7 +4,13 @@ # Lets you get a list of files for a given package name(s) without installing # any extra packages (such as yum-utils for repoquery). -import argparse +# NOTE: If you're on CentOS 6.x, since it uses such an ancient version of python you need to either install +# python-argparse OR just resign to using it for all packages with none of the features. +try: + import argparse + has_argparse = True +except ImportError: + has_argparse = False import json import os import re @@ -124,18 +130,21 @@ def parseArgs(): return(args) def main(): - args = vars(parseArgs().parse_args()) - args['rpm_files'] = [os.path.abspath(os.path.expanduser(i)) for i in args['rpm_files']] - if not any((args['rpm_files'], args['pkgs'])): - prompt_str = ('You have not specified any package names.\nThis means we will get file lists for EVERY SINGLE ' - 'installed package.\nThis is a LOT of output and can take a few moments.\nIf this was a mistake, ' - 'you can hit ctrl-c now.\nOtherwise, hit the enter key to continue.\n') - sys.stderr.write(prompt_str) - if pyver.major >= 3: - input() - elif pyver.major == 2: - raw_input() - args['pkgs'] = all_pkgs() + if has_argparse: + args = vars(parseArgs().parse_args()) + args['rpm_files'] = [os.path.abspath(os.path.expanduser(i)) for i in args['rpm_files']] + if not any((args['rpm_files'], args['pkgs'])): + prompt_str = ('You have not specified any package names.\nThis means we will get file lists for EVERY SINGLE ' + 'installed package.\nThis is a LOT of output and can take a few moments.\nIf this was a mistake, ' + 'you can hit ctrl-c now.\nOtherwise, hit the enter key to continue.\n') + sys.stderr.write(prompt_str) + if pyver.major >= 3: + input() + elif pyver.major == 2: + raw_input() + args['pkgs'] = all_pkgs() + else: + args = {'pkgs': all_pkgs()} gf = FileGetter(**args) print(json.dumps(gf.files, indent = 4)) return() diff --git a/net/irc/.gitignore b/net/irc/.gitignore new file mode 100644 index 0000000..a8683d8 --- /dev/null +++ b/net/irc/.gitignore @@ -0,0 +1 @@ +control2format.pl