commit a9cc56e511ce29884b22253328d963aefe33a2de
Author: Yawning Angel <[email protected]>
Date: Wed Dec 28 08:00:08 2016 +0000
Bug 21076: Only rewrite the autoconfig files if the manifest exists.
I assume what's happened is that a config file got created with an old
version, the install exploded, they tried master, and it puked because
it detected the git revision change and tried to rewrite the autoconfig.
---
src/cmd/sandboxed-tor-browser/internal/ui/ui.go | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/cmd/sandboxed-tor-browser/internal/ui/ui.go
b/src/cmd/sandboxed-tor-browser/internal/ui/ui.go
index d30d74c..53034e2 100644
--- a/src/cmd/sandboxed-tor-browser/internal/ui/ui.go
+++ b/src/cmd/sandboxed-tor-browser/internal/ui/ui.go
@@ -143,18 +143,18 @@ func (c *Common) Init() error {
BundleChannels[c.Cfg.Architecture] = channels
}
- // If the config is clearly from an old version, re-assert our will over
- // firefox, by re-writing the autoconfig files.
- if c.Cfg.ConfigVersionChanged {
- if err = writeAutoconfig(c.Cfg); err != nil {
- return err
- }
- }
-
if c.Manif != nil {
if err = c.Manif.Sync(); err != nil {
return err
}
+
+ // If the config is clearly from an old version, re-assert our
will
+ // over firefox, by re-writing the autoconfig files.
+ if c.Cfg.ConfigVersionChanged {
+ if err = writeAutoconfig(c.Cfg); err != nil {
+ return err
+ }
+ }
}
return c.Cfg.Sync()
}
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
