Permalink
Browse files

Applied logname patch correctly

  • Loading branch information...
Craig Small
Craig Small committed Feb 19, 2012
1 parent ac337ed commit d5417a530ff721534361c16a0959bb3f14bd2a75
Showing with 3 additions and 2 deletions.
  1. +3 −2 dh_make
View
@@ -269,9 +269,9 @@ sub get_logname
# lightdm in Ubuntu 11.10 does not set LOGNAME
# (https://bugs.launchpad.net/bugs/875705). Work around this by trying
# USER instead.
- if (exists $logname)
+ if (exists $ENV{LOGNAME})
{
- return $logname;
+ return $ENV{LOGNAME};
} elsif (exists $ENV{USER}) {
return $ENV{USER};
} else {
@@ -322,6 +322,7 @@ sub get_email()
{
return $ENV{DEBEMAIL} if ($ENV{DEBEMAIL} );
return $ENV{EMAIL} if ($ENV{EMAIL} );
+ my $logname = get_logname();
if (-x '/usr/bin/ldapsearch')
{
my $mail;

0 comments on commit d5417a5

Please sign in to comment.