summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2015-04-21 22:25:07 +0000
committerPatrick McLean <chutzpah@gentoo.org>2015-04-21 22:25:07 +0000
commit79403fd3b9af88bc55bf19d1722266957d216b07 (patch)
treecdb2f7adc2836f70a51d07cb005bc941eedf4d8c /app-admin/salt/files
parentFix glib version requirement (diff)
downloadgentoo-2-79403fd3b9af88bc55bf19d1722266957d216b07.tar.gz
gentoo-2-79403fd3b9af88bc55bf19d1722266957d216b07.tar.bz2
gentoo-2-79403fd3b9af88bc55bf19d1722266957d216b07.zip
Version bump.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
Diffstat (limited to 'app-admin/salt/files')
-rw-r--r--app-admin/salt/files/salt-2014.7.5-archive-test.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/app-admin/salt/files/salt-2014.7.5-archive-test.patch b/app-admin/salt/files/salt-2014.7.5-archive-test.patch
new file mode 100644
index 000000000000..f7ff561efd62
--- /dev/null
+++ b/app-admin/salt/files/salt-2014.7.5-archive-test.patch
@@ -0,0 +1,15 @@
+diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py
+index a7f3005..bb0bc45 100644
+--- a/tests/unit/states/archive_test.py
++++ b/tests/unit/states/archive_test.py
+@@ -78,9 +78,7 @@ class ArchiveTest(TestCase):
+ running_as = 'root'
+ filename = os.path.join(
+ tmp_dir,
+- 'files/test/_tmp{0}_test_archive.tar'.format(
+- '' if running_as == 'root' else '_{0}'.format(running_as)
+- )
++ 'files/test/_tmp_test_archive.tar'
+ )
+ for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts):
+ ret = archive.extracted(tmp_dir,