Skip to content

Commit f668ae1

Browse files
committed
Improve package conflict check
1 parent 7d165e5 commit f668ae1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

atomic-update

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

3030
# Constants
31-
VERSION = "0.1.10"
31+
VERSION = "0.1.11"
3232
ZYPPER_PID_FILE = "/run/zypp.pid"
3333
VALID_CMD = ["dup", "run", "rollback"]
3434
VALID_OPT = ["--reboot", "--apply", "--shell", "--continue", "--no-verify", \
@@ -411,7 +411,7 @@ chroot {TMP_MOUNT_DIR} mount -a -O no_netdev;
411411
for item in docroot.iter('install-summary'):
412412
num_pkgs = int(item.attrib["packages-to-change"])
413413
if not num_pkgs:
414-
if xml_output.find("conflicts") != -1:
414+
if xml_output.find("conflicts") != -1 or xml_output.find("nothing provides") != -1:
415415
logging.warning("There are package conflicts that must be manually resolved. See output of:\n" \
416416
"zypper --non-interactive --no-cd dist-upgrade --dry-run")
417417
logging.info("Nothing to do. Exiting...")

0 commit comments

Comments
 (0)