opendev
/
system-config
Code Issues Proposed changes

Merge "Update hieraedit for python3"

This commit is contained in:
Zuul 2019-04-08 18:06:41 +00:00 committed by Gerrit Code Review
parent 0c3eff57e9 2db41fc488
commit 9ed2297b2e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/hieraedit.py
View File

@ -56,7 +56,7 @@ parser.add_argument('value', help='the value', nargs='?')
parser.add_argument('-f', dest='file', help='file to read in as value') parser.add_argument('-f', dest='file', help='file to read in as value')
args = parser.parse_args() args = parser.parse_args()
data = yaml.load(open(args.yaml)) data = yaml.safe_load(open(args.yaml))
changed = False changed = False
if args.value: if args.value:
@ -65,12 +65,12 @@ if args.value:
if args.file: if args.file:
data[args.key] = open(args.file).read() data[args.key] = open(args.file).read()
changed = True changed = True
print data[args.key] print(data[args.key])
if changed: if changed:
dn = os.path.dirname(args.yaml) dn = os.path.dirname(args.yaml)
(out, fn) = tempfile.mkstemp(dir=dn) (out, fn) = tempfile.mkstemp(dir=dn)
os.write(out, yaml.dump(data, default_flow_style=False, Dumper=MyDumper)) os.write(out, yaml.dump(data, default_flow_style=False, Dumper=MyDumper).encode('utf8'))
os.close(out) os.close(out)
os.chown(fn, pwd.getpwnam('puppet').pw_uid, grp.getgrnam('puppet').gr_gid) os.chown(fn, pwd.getpwnam('root').pw_uid, grp.getgrnam('admin').gr_gid)
os.rename(fn, args.yaml) os.rename(fn, args.yaml)