diff options
Diffstat (limited to 'app-portage/layman/files/layman-2.0.0.svn_upgrade.patch')
| -rw-r--r-- | app-portage/layman/files/layman-2.0.0.svn_upgrade.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch b/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch new file mode 100644 index 000000000000..431b9370593a --- /dev/null +++ b/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch @@ -0,0 +1,58 @@ +From 580097d4bc0cd3f07b4ce1b8da33e63f03ef0305 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec <dolsen@gentoo.org> +Date: Mon, 6 Jan 2014 22:01:12 -0800 +Subject: [PATCH] Update svn's check_upgrade() for newer svn versions. + +Thanks you, Arfrever, for your assistance. +--- + layman/overlays/svn.py | 32 ++++++++++++-------------------- + 1 file changed, 12 insertions(+), 20 deletions(-) + +diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py +index 4804925..374a516 100644 +--- a/layman/overlays/svn.py ++++ b/layman/overlays/svn.py +@@ -131,27 +131,19 @@ class SvnOverlay(OverlaySource): + return + + def check_upgrade(self, target): +- '''Code to check the installed svn version and +- run "svn upgrade" if needed.''' ++ '''Code to run "svn upgrade" it only takes longer ++ than checking if it does need an upgrade if it is ++ actually needed. ++ ''' + file_to_run = _resolve_command(self.command(), self.output.error)[1] +- args = file_to_run + ' -q --version' ++ args = " ".join([file_to_run, " upgrade", target]) +- pipe = Popen(args, shell=True, stdout=PIPE) ++ pipe = Popen(args, shell=True, stdout=PIPE, stderr=PIPE) + if pipe: +- self.output.debug("SVN: check_upgrade()... have a valid pipe", 4) +- version = pipe.stdout.readline().strip('\n') +- self.output.debug("SVN: check_upgrade()... svn version found: %s" +- % version, 4) ++ self.output.debug("SVN: check_upgrade()... have a valid pipe, " ++ "running upgrade", 4) ++ upgrade_output = pipe.stdout.readline().strip('\n') ++ if upgrade_output: ++ self.output.debug(" output: %s" % upgrade_output, 4) ++ self.output.debug("SVN: check_upgrade()... svn upgrade done", 4) + pipe.terminate() +- if version >= '1.7.0': +- self.output.debug("SVN: check_upgrade()... svn upgrade maybe", +- 4) +- _path = path([target,'.svn/wc.db']) +- if not os.path.exists(_path): +- self.output.info("An svn upgrade needs to be run...", +- 2) +- args = ["upgrade"] +- return self.run_command(self.command(), args, +- cwd=target, cmd="svn upgrade") +- return +- else: +- return ++ return +-- +1.8.3.2 + |