More upgrade fixes

wtzhu-ai · Dec 23, 2014 · 81fb070 · 81fb070
1 parent a77b74c
commit 81fb070
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/package_control/package_manager.py b/package_control/package_manager.py
@@ -1275,13 +1275,17 @@ def write(string):
 
             if not view.size():
                 position = 0
-                view.settings().set("word_wrap", True)
-                view.settings().set("auto_indent", False)
                 write('Package Control Messages\n' +
                     '========================')
             else:
                 position = view.size()
 
+            view.settings().set("word_wrap", True)
+            view.settings().set("auto_indent", False)
+
+            view.sel().clear()
+            view.sel().add(sublime.Region(position, position))
+
             write(output)
             if window.active_view() != view:
                 window.focus_view(view)

diff --git a/package_control/reloader.py b/package_control/reloader.py
@@ -140,4 +140,7 @@
 for suffix in mods_load_order:
     mod = mod_prefix + suffix
     if mod in reload_mods:
-        reload(sys.modules[mod])
+        try:
+            reload(sys.modules[mod])
+        except (ImportError):
+            pass # Upgrade issues from PC 2.0 -> 3.0