Page MenuHomeFreeBSD
Differential D9189

fix patch for extra-patch-ec84ff6
ClosedPublic
Actions

Authored by lifanov on Jan 15 2017, 3:25 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mar 6 2025, 4:32 PM
Unknown Object (File)
Mar 6 2025, 6:38 AM
Unknown Object (File)
Mar 5 2025, 6:43 PM
Unknown Object (File)
Mar 3 2025, 3:09 AM
Unknown Object (File)
Mar 3 2025, 2:52 AM
Unknown Object (File)
Mar 3 2025, 2:40 AM
Unknown Object (File)
Mar 3 2025, 12:07 AM
Unknown Object (File)
Feb 23 2025, 7:20 AM
View All 52 Files
Subscribers
koobs
mat

Details

Reviewers
matthew
Commits
rP431611: fix patch for ec84ff6
Summary
fix patch for extra-patch-ec84ff6

 PR: 216103
 Submitted by: freebsd@sh0shin.org
 Reviewed by: matthew
 Approved by: matthew (mentor)
 MFH: 2017Q1
 Differential Revision: https://reviews.freebsd.org/DXXXX

The fix is correct.
I hand-ported the patches and missed this bit.

Test Plan

patch - OK
build - OK
functionality - OK

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

lifanov updated this revision to Diff 24033.Jan 15 2017, 3:25 PM
lifanov retitled this revision from to fix patch for extra-patch-ec84ff6.
lifanov updated this object.
lifanov edited the test plan for this revision. (Show Details)
lifanov added a reviewer: matthew.
lifanov added a subscriber: koobs.
Herald added a subscriber: mat. · View Herald TranscriptJan 15 2017, 3:25 PM
matthew accepted this revision.Jan 15 2017, 8:16 PM
matthew edited edge metadata.
This revision is now accepted and ready to land.Jan 15 2017, 8:16 PM
Closed by commit rP431611: fix patch for ec84ff6 (authored by lifanov). · Explain WhyJan 16 2017, 12:17 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
sysutils/
ansible/
2 lines
files/
2 lines

Diff 24048

View Options

head/sysutils/ansible/Makefile

# Created by: Nikolai Lifanov <lifanov@mail.lifanov.com> # Created by: Nikolai Lifanov <lifanov@mail.lifanov.com>
# $FreeBSD$ # $FreeBSD$
PORTNAME= ansible PORTNAME= ansible
PORTVERSION?= 2.2.0.0 PORTVERSION?= 2.2.0.0
PORTREVISION?= 2 PORTREVISION?= 3
CATEGORIES= sysutils python CATEGORIES= sysutils python
MASTER_SITES= http://releases.ansible.com/ansible/ MASTER_SITES= http://releases.ansible.com/ansible/
MAINTAINER= lifanov@FreeBSD.org MAINTAINER= lifanov@FreeBSD.org
COMMENT= Radically simple IT automation COMMENT= Radically simple IT automation
LICENSE= GPLv3+ LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines
View Options

head/sysutils/ansible/files/extra-patch-ec84ff6

Show First 20 Lines • Show All 275 Lines • ▼ Show 20 Lines+ return rval
try: try:
if convert_bare: if convert_bare:
@@ -328,14 +385,23 @@ class Templar: @@ -328,14 +385,23 @@ class Templar:
if cache and sha1_hash in self._cached_result: if cache and sha1_hash in self._cached_result:
result = self._cached_result[sha1_hash] result = self._cached_result[sha1_hash]
else: else:
- result = self._do_template(variable, preserve_trailing_newlines=preserve_trailing_newlines, escape_backslashes=escape_backslashes, fail_on_undefined=fail_on_undefined, overrides=overrides) - result = self._do_template(variable, preserve_trailing_newlines=preserve_trailing_newlines, escape_backslashes=escape_backslashes, fail_on_undefined=fail_on_undefined, overrides=overrides)
+ result = self.do_template( + result = self._do_template(
+ variable, + variable,
+ preserve_trailing_newlines=preserve_trailing_newlines, + preserve_trailing_newlines=preserve_trailing_newlines,
+ escape_backslashes=escape_backslashes, + escape_backslashes=escape_backslashes,
+ fail_on_undefined=fail_on_undefined, + fail_on_undefined=fail_on_undefined,
+ overrides=overrides, + overrides=overrides,
+ ) + )
if convert_data and not self._no_type_regex.match(variable): if convert_data and not self._no_type_regex.match(variable):
# if this looks like a dictionary or list, convert it to such using the safe_eval method # if this looks like a dictionary or list, convert it to such using the safe_eval method
▲ Show 20 Lines • Show All 67 Lines • Show Last 20 Lines