Douglas Schilling Landgraf has uploaded a new change for review. Change subject: GetoVirtISOsQuery: use version.txt ......................................................................
GetoVirtISOsQuery: use version.txt Current node hypervisors rpm contains a few files and one of them is a link to iso filename, example: ovirt-node-iso.iso points to ovirt-node-iso-3.0.4.X.X.iso On the other hand, in the past rpms we had more then one file pointing to iso with different names formatting and it can break the new regex schema to find directly the version file. Example: rhevh-hypervisor.iso, rhevh-hypervisor6.iso, rhevh-latest-6.iso are pointing to /usr/share/rhev-hypervisor/rhevh-X.X.iso This patch will make GetoVirtISOsQuery.java uses the symbol link version.txt instead of trying to catch the versioning file. Change-Id: I39ad1403b4afc8e6a5500c910560172395ee31fe Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1082612 Signed-off-by: Douglas Schilling Landgraf <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetoVirtISOsQuery.java 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/26444/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetoVirtISOsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetoVirtISOsQuery.java index 07da53e..4229796 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetoVirtISOsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetoVirtISOsQuery.java @@ -60,7 +60,7 @@ log.debugFormat("ISO Found [{0}]", file); String version = matcher.group(1); log.debugFormat("ISO Version [{0}]", version); - File versionFile = new File(info.path, String.format("version-%s.txt", version)); + File versionFile = new File(info.path, String.format("%s.txt", OVIRT_ISO_VERSION_PREFIX)); log.debugFormat("versionFile [{0}]", versionFile); // Setting IsoData Class to get further [version] and [vdsm compatibility version] data -- To view, visit http://gerrit.ovirt.org/26444 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I39ad1403b4afc8e6a5500c910560172395ee31fe Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
