56 lines
2.4 KiB
Diff
56 lines
2.4 KiB
Diff
|
From 17c88d9451774cd3910f81eaa889d4ff14615e1c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Evgeni Golov <evgeni@golov.de>
|
||
|
|
Date: Mon, 30 Oct 2023 17:36:23 +0100
|
||
|
|
Subject: [PATCH 21/38] call correct mkdir when trying to create
|
||
|
|
/etc/rhsm/facts (#1132)
|
||
|
|
|
||
|
|
os.path has no mkdir, but os does.
|
||
|
|
|
||
|
|
traceback without the patch:
|
||
|
|
|
||
|
|
Traceback (most recent call last):
|
||
|
|
File "/bin/leapp", line 11, in <module>
|
||
|
|
load_entry_point('leapp==0.16.0', 'console_scripts', 'leapp')()
|
||
|
|
File "/usr/lib/python3.6/site-packages/leapp/cli/__init__.py", line 45, in main
|
||
|
|
cli.command.execute('leapp version {}'.format(VERSION))
|
||
|
|
File "/usr/lib/python3.6/site-packages/leapp/utils/clicmd.py", line 111, in execute
|
||
|
|
args.func(args)
|
||
|
|
File "/usr/lib/python3.6/site-packages/leapp/utils/clicmd.py", line 133, in called
|
||
|
|
self.target(args)
|
||
|
|
File "/usr/lib/python3.6/site-packages/leapp/cli/commands/upgrade/breadcrumbs.py", line 170, in wrapper
|
||
|
|
breadcrumbs.save()
|
||
|
|
File "/usr/lib/python3.6/site-packages/leapp/cli/commands/upgrade/breadcrumbs.py", line 116, in save
|
||
|
|
self._save_rhsm_facts(doc['activities'])
|
||
|
|
File "/usr/lib/python3.6/site-packages/leapp/cli/commands/upgrade/breadcrumbs.py", line 64, in _save_rhsm_facts
|
||
|
|
os.path.mkdir('/etc/rhsm/facts')
|
||
|
|
AttributeError: module 'posixpath' has no attribute 'mkdir'
|
||
|
|
|
||
|
|
While at it, also catch OSError with errno 17, to safeguard against race
|
||
|
|
conditions if anything has created the directory between us checking for
|
||
|
|
it and us trying to create it.
|
||
|
|
---
|
||
|
|
commands/upgrade/breadcrumbs.py | 7 ++++++-
|
||
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/commands/upgrade/breadcrumbs.py b/commands/upgrade/breadcrumbs.py
|
||
|
|
index 16903ee0..3a3dcde3 100644
|
||
|
|
--- a/commands/upgrade/breadcrumbs.py
|
||
|
|
+++ b/commands/upgrade/breadcrumbs.py
|
||
|
|
@@ -61,7 +61,12 @@ class _BreadCrumbs(object):
|
||
|
|
if not os.path.exists('/etc/rhsm'):
|
||
|
|
# If there's no /etc/rhsm folder just skip it
|
||
|
|
return
|
||
|
|
- os.path.mkdir('/etc/rhsm/facts')
|
||
|
|
+ try:
|
||
|
|
+ os.mkdir('/etc/rhsm/facts')
|
||
|
|
+ except OSError as e:
|
||
|
|
+ if e.errno == 17:
|
||
|
|
+ # The directory already exists which is all we need.
|
||
|
|
+ pass
|
||
|
|
try:
|
||
|
|
with open('/etc/rhsm/facts/leapp.facts', 'w') as f:
|
||
|
|
json.dump(_flattened({
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|