If a previous version of git was installed on a system without a proper Error.pm, git will install its own. But the next time git is compiled on that system, that Error.pm will prevent git from installing its own copy the second time. This causes a broken git install on such systems. This patch fixes this bug by tagging git's Error.pm with an INSTALLED_BY flag, and checking for it during the compile. Signed-off-by: Chris Frey <cdfrey@xxxxxxxxxxxxxx> --- Resending patch from last week, as I saw no comments. Please apply. Thanks! Thoughts on the patch: I use 'stow' to handle multiple versions of git installations. So when I uninstall a version of git, all those files are truly gone. Including Error.pm. But if a new version was compiled while the old was still there, the new stow install will be missing Error.pm. This bug was hit in April by "carbonated beverage": http://marc.info/?l=git&m=120805594920430&w=2 I think it is wise to mark our own copy of Error.pm in some way, just so people can tell the difference between versions on their systems. The drawback to this patch is that once git installs its own copy, it will always install its own copy, unless the user uninstalls the old git first. Usually this is the desired behaviour, but my perl-fu isn't strong enough to make this check even smarter. Ideally, if a newer version is on the system already, git shouldn't have to install its own. - Chris perl/Makefile.PL | 14 ++++++++++++-- perl/private-Error.pm | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/perl/Makefile.PL b/perl/Makefile.PL index 320253e..26f7a8c 100644 --- a/perl/Makefile.PL +++ b/perl/Makefile.PL @@ -11,9 +11,19 @@ MAKE_FRAG my %pm = ('Git.pm' => '$(INST_LIBDIR)/Git.pm'); # We come with our own bundled Error.pm. It's not in the set of default -# Perl modules so install it if it's not available on the system yet. +# Perl modules. So, unless it was a copy we installed, install it +# if it's not available on the system yet. eval { require Error }; -if ($@ || $Error::VERSION < 0.15009) { +if ($@ || $Error::VERSION < 0.15009 || $Error::INSTALLED_BY eq 'git') { + if ($Error::INSTALLED_BY eq 'git') { + print "**************************************************\n"; + print "WARNING: detected an Error.pm from a previous git\n"; + print " install, so assuming that you wish to\n"; + print " continue using git's version. If this is\n"; + print " not the case, uninstall your old version\n"; + print " of git before compiling the new.\n"; + print "**************************************************\n"; + } $pm{'private-Error.pm'} = '$(INST_LIBDIR)/Error.pm'; } diff --git a/perl/private-Error.pm b/perl/private-Error.pm index 11e9cd9..a399983 100644 --- a/perl/private-Error.pm +++ b/perl/private-Error.pm @@ -16,6 +16,7 @@ use vars qw($VERSION); use 5.004; $VERSION = "0.15009"; +$Error::INSTALLED_BY = "git"; use overload ( '""' => 'stringify', -- 1.5.4.4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
