[Rt-commit] rt branch, 4.2/remove-win32, created. rt-4.2.3-7-g1d4490c

[Alex Vandiver]

The branch, 4.2/remove-win32 has been created
        at  1d4490cdb50301883fda9910e0edc9f653f51a56 (commit)

- Log -----------------------------------------------------------------
commit 1d4490cdb50301883fda9910e0edc9f653f51a56
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Feb 24 16:49:24 2014 -0500

    win32 is not a supported platform; remove remaining incidental mentions of it

diff --git a/config.layout b/config.layout
index decebae..15fcf08 100755
--- a/config.layout
+++ b/config.layout
@@ -130,34 +130,6 @@
   customplugindir:  ${customdir}/local/plugins
 </Layout>
 
-<Layout Win32>
-  prefix:		C:/Program Files/Request Tracker
-  exec_prefix:		${prefix}
-  bindir:		${exec_prefix}/bin
-  sbindir:		${exec_prefix}/sbin
-  sysconfdir:		${prefix}/etc
-  mandir:		${prefix}/man
-  plugindir:		${prefix}/plugins
-  libdir:		${prefix}/lib
-  datadir:		${prefix}
-  htmldir:		${datadir}/html
-  fontdir:		${datadir}/fonts
-  lexdir:		${datadir}/po
-  staticdir:	${datadir}/static
-  manualdir:		${datadir}/doc
-  localstatedir:	${prefix}/var
-  logfiledir:		${localstatedir}/log
-  masonstatedir:	${localstatedir}/mason_data
-  sessionstatedir:	${localstatedir}/session_data
-  customdir:		${prefix}/local
-  custometcdir:		${customdir}/etc
-  customhtmldir:	${customdir}/html
-  customlexdir:		${customdir}/po
-  customstaticdir:	${customdir}/static
-  customlibdir:		${customdir}/lib
-  customplugindir:  ${customdir}/plugins
-</Layout>
-
 #   RH path layout.
 <Layout RH>
   prefix:		/usr
diff --git a/lib/RT/Interface/CLI.pm b/lib/RT/Interface/CLI.pm
index 8b6e540..8f162c2 100644
--- a/lib/RT/Interface/CLI.pm
+++ b/lib/RT/Interface/CLI.pm
@@ -126,7 +126,7 @@ sub GetCurrentUser  {
     
     #Instantiate a user object
     
-    my $Gecos= ($^O eq 'MSWin32') ? Win32::LoginName() : (getpwuid($<))[0];
+    my $Gecos= (getpwuid($<))[0];
 
     #If the current user is 0, then RT will assume that the User object
     #is that of the currentuser.
diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index 8f690fe..16a9352 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -704,11 +704,6 @@ sub AttemptExternalAuth {
         $user = RT::Interface::Web::WebCanonicalizeInfo();
         my $load_method = RT->Config->Get('WebRemoteUserGecos') ? 'LoadByGecos' : 'Load';
 
-        if ( $^O eq 'MSWin32' and RT->Config->Get('WebRemoteUserGecos') ) {
-            my $NodeName = Win32::NodeName();
-            $user =~ s/^\Q$NodeName\E\\//i;
-        }
-
         my $next = RemoveNextPage($ARGS->{'next'});
            $next = $next->{'url'} if ref $next;
         InstantiateNewSession() unless _UserLoggedIn;
diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 94dff02..4b2221e 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -1587,10 +1587,8 @@ sub start_plack_server {
     }
 
     require POSIX;
-    if ( $^O !~ /MSWin32/ ) {
-        POSIX::setsid()
-            or die "Can't start a new session: $!";
-    }
+    POSIX::setsid()
+          or die "Can't start a new session: $!";
 
     # stick this in a scope so that when $app is garbage collected,
     # StashWarnings can complain about unhandled warnings
@@ -1776,12 +1774,4 @@ END {
     }
 }
 
-{ 
-    # ease the used only once warning
-    no warnings;
-    no strict 'refs';
-    %{'RT::I18N::en_us::Lexicon'};
-    %{'Win32::Locale::Lexicon'};
-}
-
 1;
diff --git a/t/ticket/action_linear_escalate.t b/t/ticket/action_linear_escalate.t
index 0d1ff8a..8c158aa 100644
--- a/t/ticket/action_linear_escalate.t
+++ b/t/ticket/action_linear_escalate.t
@@ -19,7 +19,7 @@ ok $q && $q->id, 'loaded or created queue';
 my $gecos = RT::Test->load_or_create_user(
     Name => 'gecos',
     Password => 'password',
-    Gecos => ($^O eq 'MSWin32') ? Win32::LoginName() : (getpwuid($<))[0],
+    Gecos => (getpwuid($<))[0],
 );
 ok $gecos && $gecos->id, 'loaded or created gecos user';
 

-----------------------------------------------------------------------