diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2014-03-10 11:27:35 +0000 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2014-03-10 11:27:35 +0000 |
| commit | 6e199103f3cfd07f62b780729418467edb60c235 (patch) | |
| tree | 2f5d57a098350133e01c472cd072e26917dc5c98 /app-portage | |
| parent | new dev-libs/liblogging fix #501976 thx to Thomas D. (diff) | |
| download | gentoo-2-6e199103f3cfd07f62b780729418467edb60c235.tar.gz gentoo-2-6e199103f3cfd07f62b780729418467edb60c235.tar.bz2 gentoo-2-6e199103f3cfd07f62b780729418467edb60c235.zip | |
Fix bad patch.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x65E309F2189DB0B8)
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/layman/ChangeLog | 6 | ||||
| -rw-r--r-- | app-portage/layman/files/layman-2.0.0.svn_upgrade.patch | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog index f1568428688a..ecb83d95b41a 100644 --- a/app-portage/layman/ChangeLog +++ b/app-portage/layman/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-portage/layman # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.186 2014/03/10 03:32:07 dolsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.187 2014/03/10 11:27:35 dolsen Exp $ + + 10 Mar 2014; Brian Dolbec <dolsen@gentoo.org> + files/layman-2.0.0.svn_upgrade.patch: + Fix the layman-2.0.0.svn_upgrade.patch. *layman-2.0.0-r3 (10 Mar 2014) 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 index 55bd09671be1..431b9370593a 100644 --- a/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch +++ b/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch @@ -25,7 +25,8 @@ index 4804925..374a516 100644 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, stderr=PIPE) +- 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') |