Merge lp:~mandel/ubuntuone-windows-installer/manual_sync_does_nothing into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

Fixed python code that prevented manual sync from working.
Changed the config of the logging so that it uses the appdata of the current user.

[John Lenton (chipaca)]

review: Approve

[lp:~mandel/ubuntuone-windows-installer/manual_sync_does_nothing]

176. By Manuel de la Peña on 2010-11-11

Use the appdata dir for logs.

=== modified file 'src/UbuntuOneClient/App.config'
--- src/UbuntuOneClient/App.config	2010-10-18 10:53:55 +0000
+++ src/UbuntuOneClient/App.config	2010-11-11 11:28:42 +0000
@@ -21,8 +21,8 @@
         <!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL-->
         <!-- otherwise BasicConfigurer.Configure is used   -->
         <!-- log4net configuration file is specified with key configFile-->
-        <arg key="configType" value="FILE"/>
-        <arg key="configFile" value="~/Config/log4net.config"/>
+        <arg key="configType" value="FILE-WATCH" />
+        <arg key="configFile" value="~/Config/log4net.config" />
       </factoryAdapter>
     </logging>
   </common>
 
=== modified file 'src/UbuntuOneClient/Config/log4net.config'
--- src/UbuntuOneClient/Config/log4net.config	2010-11-11 11:28:42 +0000
+++ src/UbuntuOneClient/Config/log4net.config	2010-11-11 11:28:42 +0000
@@ -2,7 +2,7 @@
 <log4net>
   <appender name="RollingFileAppender"
             type="log4net.Appender.RollingFileAppender">
-    <file value="Logs/Client.log" />
+    <file value="${APPDATA}\UbuntuOneClient\Client.log" />
     <appendToFile value="true" />
     <rollingStyle value="Size" />
     <maxSizeRollBackups value="10" />
 
=== modified file 'src/sync/u1sync/main.py'
--- src/sync/u1sync/main.py	2010-11-11 11:28:42 +0000
+++ src/sync/u1sync/main.py	2010-11-11 11:28:42 +0000
@@ -47,7 +47,6 @@
 from u1sync import metadata
 from u1sync.constants import METADATA_DIR_NAME
 from u1sync.ubuntuone_optparse import UbuntuOneOptionsParser
-from u1sync.icons import file_was_added, file_was_modified
 
 # pylint: disable-msg=W0212
 NODE_TYPE_ENUM = dircontent_pb2._NODETYPE
@@ -322,13 +321,7 @@
             queue.put(None)
         finally:
             reactor.callWhenRunning(reactor.stop)
-
-    # test if the user wants to know f a path was added or modified
-    if options_parser.options.was_added:
-        return file_was_added(options_parser.options.was_added) 
-    if options_parser.options.was_modified:
-        return file_was_modified(options_parser.options.was_modified)
-        
+            
     queue = Queue()
     reactor.callInThread(capture_exception, queue, run_client)
     reactor.run(installSignalHandlers=False)
 
=== modified file 'src/sync/u1sync/ubuntuone_optparse.py'
--- src/sync/u1sync/ubuntuone_optparse.py	2010-11-11 11:28:42 +0000
+++ src/sync/u1sync/ubuntuone_optparse.py	2010-11-11 11:28:42 +0000
@@ -102,12 +102,6 @@
         self.add_option("--subtree", dest="subtree", metavar="PATH",
                           default=None,
                           help="Mirror a subset of the share or volume")
-        self.add_option("--was-added", dest="was_added", metavar="PATH",
-                          default=None,
-                          help="Returns if the metadata know about the path.")
-        self.add_option("--was-modified", dest="was_modified", metavar="PATH",
-                          default=None,
-                          help="Returns if the file has been locally modified")
     
     def get_options(self, arguments):
         """Parses the arguments to from the command line."""
@@ -188,8 +182,6 @@
     
     def _validate_oauth(self):
         """Validates that the oatuh was passed."""
-        if self.options.was_modified or self.options.was_added:
-            return
         if self.options.oauth is None:
             self.error("--oauth is currently compulsery.")
         else: