Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions glazier/lib/disk.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ def get_disk_space():
return shutil.disk_usage('/')
except FileNotFoundError:
logging.error(
'Failed to locate OS partition. Could not determine disk size.')
'Failed to locate OS partition. Could not determine disk size.'
)


def set_disk_space() -> None:
Expand All @@ -42,10 +43,14 @@ def set_disk_space() -> None:
is actually needed.
"""
space = get_disk_space()

if space is None:
return
for k, v in space._asdict().items():
try:
registry.set_value(
f'disk_space_{k}_bytes', str(v), path=constants.REG_ROOT)
f'disk_space_{k}_bytes', str(v), path=constants.REG_ROOT
)
except registry.Error as e:
logging.error('Failed to write %s_disk_space to registry: %s', k, str(e))
logging.error(
'Failed to write %s_disk_space to registry: %s', k, str(e)
)
5 changes: 3 additions & 2 deletions glazier/lib/log_copy.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import logging
import logging.handlers
import shutil
from typing import Optional

# do not remove: internal placeholder 1
from glazier.lib import drive_map
Expand Down Expand Up @@ -46,11 +47,11 @@ def __init__(self):
self._username = None
self._password = None

def GetUsername(self) -> str:
def GetUsername(self) -> Optional[str]:
"""Override to provide share credentials."""
return self._username

def GetPassword(self) -> str:
def GetPassword(self) -> Optional[str]:
"""Override to provide share credentials."""
return self._password

Expand Down
Loading