Merge ~smoser/ubuntu/+source/ssh-import-id:fix/xenial-1570997-no-home-environ into ubuntu/+source/ssh-import-id:ubuntu/xenial-devel

[Scott Moser]

[Robie Basak (racb)]

review: Needs Information

[Scott Moser (smoser)]

uploaded. http://paste.ubuntu.com/p/bFZ3p9kzfH/
bc76249f0af9e4c155238064d30b901061caf75c

[Scott Moser (smoser)]

this specific change actually failed.
ssh-import-id has been correctly fixed upstream and is SRU'd to bionic now.

Unmerged commits

bc76249... by Scott Moser on 2018-03-27

update changelog.

098d48c... by Scott Moser on 2018-03-27

Fix failure if HOME not set in environment.

LP: #1570997

diff --git a/debian/changelog b/debian/changelog
index da9a63a..746737f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ssh-import-id (5.5-0ubuntu1.1) xenial; urgency=medium
+
+  * Fix failure when HOME is not set in environment. (LP: #1570997)
+
+ -- Scott Moser <[e-mail]>  Tue, 27 Mar 2018 14:28:28 -0400
+
 ssh-import-id (5.5-0ubuntu1) xenial; urgency=medium
 
   * debian/control, debian/rules, setup.py, ssh_import_id/__init__.py:
diff --git a/ssh_import_id/__init__.py b/ssh_import_id/__init__.py
index 9296295..0730db0 100644
--- a/ssh_import_id/__init__.py
+++ b/ssh_import_id/__init__.py
@@ -18,6 +18,7 @@
 # along with ssh-import-id.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
+import getpass
 import json
 import logging
 import os
@@ -132,7 +133,15 @@ def read_keyfile():
 	Locate key file, read the current state, return lines in a list
 	"""
 	lines = []
-	output_file = parser.options.output or os.path.join(os.getenv("HOME"), ".ssh", "authorized_keys")
+	if parser.options.output:
+		output_file = parser.options.output
+	else:
+		if os.environ.get("HOME"):
+			home = os.environ["HOME"]
+		else:
+			home = os.path.expanduser("~" + getpass.getuser())
+		output_file = os.path.join(home, ".ssh", "authorized_keys")
+
 	if os.path.exists(output_file):
 		try:
 			with open(output_file, "r") as f: