Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Make versionlock optional ......................................................................
packaging: setup: Make versionlock optional Do not edit it if there is nothing to put there. Change-Id: I5e1bb5dff7a3b878ba09378a1f5e819c382684cb Related-To: https://bugzilla.redhat.com/1080997 Related-To: https://bugzilla.redhat.com/1080998 Signed-off-by: Yedidyah Bar David <d...@redhat.com> --- M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py 1 file changed, 38 insertions(+), 37 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/27265/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py index e1aa4dd..000888b 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py @@ -126,46 +126,47 @@ # execute rpm directly # yum is not good in offline usage - rc, out, err = self._parent.execute( - args=( - self._parent.command.get('rpm'), - '-q', - ) + tuple( - self.environment[ - osetupcons.RPMDistroEnv.VERSION_LOCK_APPLY - ] - ), - ) - changes = [] - for line in out: - changes.append( - { - 'added': line, - } + if self.environment[osetupcons.RPMDistroEnv.VERSION_LOCK_APPLY]: + rc, out, err = self._parent.execute( + args=( + self._parent.command.get('rpm'), + '-q', + ) + tuple( + self.environment[ + osetupcons.RPMDistroEnv.VERSION_LOCK_APPLY + ] + ), ) - self.environment[ - osetupcons.CoreEnv.UNINSTALL_UNREMOVABLE_FILES - ].append(osetupcons.FileLocations.OVIRT_ENGINE_YUM_VERSIONLOCK) + changes = [] + for line in out: + changes.append( + { + 'added': line, + } + ) + self.environment[ + osetupcons.CoreEnv.UNINSTALL_UNREMOVABLE_FILES + ].append(osetupcons.FileLocations.OVIRT_ENGINE_YUM_VERSIONLOCK) - self.environment[ - osetupcons.CoreEnv.REGISTER_UNINSTALL_GROUPS - ].createGroup( - group='versionlock', - description='YUM version locking configuration', - optional=False - ).addChanges( - 'versionlock', - osetupcons.FileLocations.OVIRT_ENGINE_YUM_VERSIONLOCK, - changes, - ) + self.environment[ + osetupcons.CoreEnv.REGISTER_UNINSTALL_GROUPS + ].createGroup( + group='versionlock', + description='YUM version locking configuration', + optional=False + ).addChanges( + 'versionlock', + osetupcons.FileLocations.OVIRT_ENGINE_YUM_VERSIONLOCK, + changes, + ) - modified, content = self._filterVersionLock() - content.extend(out) - with open( - osetupcons.FileLocations.OVIRT_ENGINE_YUM_VERSIONLOCK, - 'w', - ) as f: - f.write('\n'.join(content) + '\n') + modified, content = self._filterVersionLock() + content.extend(out) + with open( + osetupcons.FileLocations.OVIRT_ENGINE_YUM_VERSIONLOCK, + 'w', + ) as f: + f.write('\n'.join(content) + '\n') def _getSink(self): class MyMiniYumSink(self._miniyum.MiniYumSinkBase): -- To view, visit http://gerrit.ovirt.org/27265 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e1bb5dff7a3b878ba09378a1f5e819c382684cb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
