Hello community, here is the log from the commit of package multipath-tools for openSUSE:Factory checked in at 2016-09-17 14:33:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/multipath-tools (Old) and /work/SRC/openSUSE:Factory/.multipath-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "multipath-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/multipath-tools/multipath-tools.changes 2016-09-05 21:16:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.multipath-tools.new/multipath-tools.changes 2016-09-17 14:33:28.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Sep 8 14:23:16 CEST 2016 - h...@suse.de + +- Fixup glitch from patch 'fixup check from udev rules' (bsc#986734) +- Remove 0001-libmultipath-fall-back-to-search-paths-by-devt.patch; + integrated into git repository + +------------------------------------------------------------------- +Mon Aug 29 10:32:36 UTC 2016 - jthumsh...@suse.com + +- libmultipath: fall back to search paths by devt (bsc#995645) + +------------------------------------------------------------------- Old: ---- multipath-tools-0.6.2+suse20160826.4abd547.tar.xz New: ---- multipath-tools-0.6.2+suse20160908.d93a87f.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools.spec ++++++ --- /var/tmp/diff_new_pack.iRmytx/_old 2016-09-17 14:33:29.000000000 +0200 +++ /var/tmp/diff_new_pack.iRmytx/_new 2016-09-17 14:33:29.000000000 +0200 @@ -16,7 +16,7 @@ # -%define version_unconverted 0.6.2+suse20160826.4abd547 +%define version_unconverted 0.6.2+suse20160908.d93a87f Name: multipath-tools BuildRequires: device-mapper-devel @@ -31,7 +31,7 @@ Requires: device-mapper >= 1.2.78 Requires: kpartx PreReq: %insserv_prereq %fillup_prereq coreutils grep -Version: 0.6.2+suse20160826.4abd547 +Version: 0.6.2+suse20160908.d93a87f Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.iRmytx/_old 2016-09-17 14:33:29.000000000 +0200 +++ /var/tmp/diff_new_pack.iRmytx/_new 2016-09-17 14:33:29.000000000 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/hreinecke/multipath-tools.git</param> - <param name="changesrevision">4abd547c2b2ba929f34183d6da768e4e239d6711</param> + <param name="changesrevision">d93a87fc646ea7a1d6871672f2b59cccfccafdf3</param> </service> </servicedata> ++++++ multipath-tools-0.6.2+suse20160826.4abd547.tar.xz -> multipath-tools-0.6.2+suse20160908.d93a87f.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.6.2+suse20160826.4abd547/libmultipath/discovery.c new/multipath-tools-0.6.2+suse20160908.d93a87f/libmultipath/discovery.c --- old/multipath-tools-0.6.2+suse20160826.4abd547/libmultipath/discovery.c 2016-08-26 08:56:04.000000000 +0200 +++ new/multipath-tools-0.6.2+suse20160908.d93a87f/libmultipath/discovery.c 2016-09-08 14:20:03.000000000 +0200 @@ -126,8 +126,15 @@ pp = find_path_by_dev(pathvec, (char *)devname); if (!pp) { - return store_pathinfo(pathvec, conf, - udevice, flag, NULL); + char devt[BLK_DEV_SIZE]; + dev_t devnum = udev_device_get_devnum(udevice); + + snprintf(devt, BLK_DEV_SIZE, "%d:%d", + major(devnum), minor(devnum)); + pp = find_path_by_devt(pathvec, devt); + if (!pp) + return store_pathinfo(pathvec, conf, + udevice, flag, NULL); } return pathinfo(pp, conf, flag); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.6.2+suse20160826.4abd547/libmultipath/dmparser.c new/multipath-tools-0.6.2+suse20160908.d93a87f/libmultipath/dmparser.c --- old/multipath-tools-0.6.2+suse20160826.4abd547/libmultipath/dmparser.c 2016-08-26 08:56:04.000000000 +0200 +++ new/multipath-tools-0.6.2+suse20160908.d93a87f/libmultipath/dmparser.c 2016-09-08 14:20:03.000000000 +0200 @@ -331,12 +331,15 @@ if (devt2devname(devname, FILE_NAME_SIZE, word)) { condlog(2, "%s: cannot find block device", word); - FREE(word); - continue; + devname[0] = '\0'; } - if (pathvec) - pp = find_path_by_dev(pathvec, devname); + if (pathvec) { + if (strlen(devname)) + pp = find_path_by_dev(pathvec, devname); + else + pp = find_path_by_devt(pathvec, word); + } if (!pp) { pp = alloc_path(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.6.2+suse20160826.4abd547/multipath/main.c new/multipath-tools-0.6.2+suse20160908.d93a87f/multipath/main.c --- old/multipath-tools-0.6.2+suse20160826.4abd547/multipath/main.c 2016-08-26 08:56:04.000000000 +0200 +++ new/multipath-tools-0.6.2+suse20160908.d93a87f/multipath/main.c 2016-09-08 14:20:03.000000000 +0200 @@ -682,9 +682,8 @@ "multipath device path\n", dev); goto out; } - goto out; - } - mpath_disconnect(fd); + } else + mpath_disconnect(fd); } if (cmd == CMD_REMOVE_WWID && !dev) { condlog(0, "the -w option requires a device");