Merge pull request #2 from prisms-center/4.X

getlogin bug fix

README.md

@@ -99,9 +99,9 @@ If installing to a user directory, you may need to set your PATH to find the ins
         git clone https://github.com/prisms-center/prisms_jobs.git
         cd prisms_jobs
 
-2. Checkout the branch/tag containing the version you wish to install. Latest is ``v4.0.0``:
+2. Checkout the branch/tag containing the version you wish to install. Latest is ``v4.0.1``:
 
-        git checkout v4.0.0
+        git checkout v4.0.1
 
 2. From the root directory of the repository:
 

conda-recipes/prisms_jobs/meta.yaml

@@ -1,9 +1,9 @@
 package:
   name: prisms-jobs
-  version: "4.0.0"
+  version: "4.0.1"
 
 source:
-  git_rev: v4.0.0
+  git_rev: v4.0.1
   git_url: https://github.com/prisms-center/prisms_jobs.git
 
 requirements:

doc/source/conf.py

@@ -86,7 +86,7 @@
 # The short X.Y version.
 version = u'4.0'
 # The full version, including alpha/beta/rc tags.
-release = u'4.0.0'
+release = u'4.0.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/source/install.rst

@@ -45,11 +45,11 @@ Install from source
     git clone https://github.com/prisms-center/prisms_jobs.git
     cd prisms_jobs
 
-2. Checkout the branch/tag containing the version you wish to install. Latest is ``v4.0.0``:
+2. Checkout the branch/tag containing the version you wish to install. Latest is ``v4.0.1``:
 
 ::
 
-    git checkout v4.0.0
+    git checkout v4.0.1
 
 3. From the root directory of the repository:
 

prisms_jobs/__init__.py

@@ -14,7 +14,7 @@ def __str__(self):
 from prisms_jobs.job import Job
 from prisms_jobs.jobdb import JobDB, JobDBError, EligibilityError, complete_job, error_job
 
-__version__ = '4.0.0'
+__version__ = '4.0.1'
 __all__ = [
     'Job',
     'JobDB',

prisms_jobs/misc.py

@@ -4,6 +4,7 @@
 
 import datetime
 import os
+import pwd
 import subprocess
 import sys
 
@@ -61,11 +62,9 @@ def run(cmd, input=None, stdin=None, encoding=None):
 def getlogin():
     """Returns os.getlogin(), else os.environ["LOGNAME"], else "?" """
     try:
-        return os.getlogin()
-    except OSError:
-        return os.environ["LOGNAME"]
-    else:
-        return "?"
+        return pwd.getpwuid(os.getuid())[0]
+    except:
+        return os.environ.get("LOGNAME","?")
 
 def seconds(walltime):
     """Convert [[[DD:]HH:]MM:]SS to hours"""