Skip to content

Commit 1efc1c6

Browse files
committed
fix zypp lock on dup conflict
1 parent 34872c3 commit 1efc1c6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

zypperoni

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ from shlex import quote
2929
import xml.etree.ElementTree as ET
3030

3131
# Constants
32-
ZYPPERONI_VERSION = "1.1.0"
32+
ZYPPERONI_VERSION = "1.1.1"
3333
ZYPPER_PID_FILE = "/run/zypp.pid"
3434
ZYPPER_ENV = "ZYPP_CURL2=1 ZYPP_PCK_PRELOAD=1 ZYPP_SINGLE_RPMTRANS=1"
3535

@@ -472,7 +472,6 @@ elif args.command_name in ["dist-upgrade", "dup"]:
472472
logging.info(color("info", "Nothing to do. Exiting..."))
473473
zypperoni_cleanup()
474474
sys.exit()
475-
get_zypp_lock()
476475
docroot = ET.fromstring(xml_output)
477476
diff_bytes, download_size_bytes, num_pkgs = (None,) * 3
478477
for item in docroot.iter('install-summary'):
@@ -511,6 +510,7 @@ elif args.command_name in ["dist-upgrade", "dup"]:
511510
if item.attrib.get("kind") == "package":
512511
DUP_PKG.append(f"{item.attrib['name']}-{item.attrib['edition']}.{item.attrib['arch']}")
513512
DUP_PKG.sort()
513+
get_zypp_lock()
514514
if not DUP_PKG:
515515
logging.info(color("info", "Nothing to do. Exiting..."))
516516
zypperoni_cleanup()

0 commit comments

Comments
 (0)