Merge pull request commaai#12 from arne182/release2

Merge
mespiritu · Mar 16, 2019 · 75a64cc · 75a64cc
2 parents 2132fcd + f474e5c
commit 75a64cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py
@@ -306,8 +306,8 @@ def update(self, c):
       self.CS.follow_level -= 1
       if self.CS.follow_level < 1:
         self.CS.follow_level = 3
-      self.kegman.conf['lastTrMode'] = str(self.CS.follow_level)   # write last distance bar setting to file
-      self.kegman.write_config(self.kegman.conf) 
+      kegman.conf['lastTrMode'] = str(self.CS.follow_level)   # write last distance bar setting to file
+      kegman.write_config(kegman.conf) 
     ret.gasbuttonstatus = self.CS.cstm_btns.get_button_status("gas")
     events = []
     if not self.CS.can_valid:

diff --git a/selfdrive/loggerd/uploader.py b/selfdrive/loggerd/uploader.py
@@ -115,7 +115,10 @@ def gen_upload_files(self):
       return
     for logname in listdir_by_creation_date(self.root):
       path = os.path.join(self.root, logname)
-      names = os.listdir(path)
+      try:
+        names = os.listdir(path)
+      except OSError:
+        pass
       if any(name.endswith(".lock") for name in names):
         continue