summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragriffis <agriffis@gentoo.org>2004-03-29 16:23:37 +0000
committeragriffis <agriffis@gentoo.org>2004-03-29 16:23:37 +0000
commit7784410af1a1465846fdbc527ae69998c957680d (patch)
tree9726f6cd81a1136fbdb3819943a0cd01c7190e0b
parent0eaef4427bb43b0c375b68bb15f6ad0acc42505c (diff)
downloadgentoolkit-7784410af1a1465846fdbc527ae69998c957680d.tar.gz
fix bug 46111 by testing for /<root@/ instead of / root@/
svn path=/; revision=97
-rw-r--r--trunk/src/echangelog/ChangeLog3
-rw-r--r--trunk/src/echangelog/echangelog2
2 files changed, 4 insertions, 1 deletions
diff --git a/trunk/src/echangelog/ChangeLog b/trunk/src/echangelog/ChangeLog
index 2a100cb..b079e53 100644
--- a/trunk/src/echangelog/ChangeLog
+++ b/trunk/src/echangelog/ChangeLog
@@ -1,3 +1,6 @@
+29 Mar 2004 Aron Griffis <agriffis@gentoo.org>
+ * fix bug 46111 by testing for /<root@/ instead of / root@/
+
28 Mar 2004 Aron Griffis <agriffis@gentoo.org>
* apply patch from plasmaroo, with minor modifications, to enable EDITOR
and +- support
diff --git a/trunk/src/echangelog/echangelog b/trunk/src/echangelog/echangelog
index 8b78051..3a8c3c5 100644
--- a/trunk/src/echangelog/echangelog
+++ b/trunk/src/echangelog/echangelog
@@ -163,7 +163,7 @@ $input =~ s/^/ /gm; # add indentation
$user = $ENV{'ECHANGELOG_USER'} ||
sprintf("%s <%s\@gentoo.org>", (getpwuid($<))[6,0]);
# Make sure that we didn't get "root"
-die "Please set ECHANGELOG_USER or run as non-root\n" if $user =~ / root@/;
+die "Please set ECHANGELOG_USER or run as non-root\n" if $user =~ /<root@/;
$date = strftime("%d %b %Y", localtime);
$entry = "$date; $user ";
$entry .= join ', ', map "$actions{$_}$_", grep !/files.digest|Manifest/, @files;