Changeset 341 in tailor for vcpx/session.py

Timestamp:

06/01/05 14:29:42 (8 years ago)

Author:

lele@…

Hash name:

20050601122942-97f81-550963d95558d1c1020c33c91949029da81f6423

Message:

Add newline only in verbose mode on stdout

File:

• vcpx/session.py (modified) (25 diffs)

vcpx/session.py

@@ -91 +91 @@
         if self.options.verbose:
             self.stdout.write(what)
+            self.stdout.write('\n')
 
     def __err(self, what):
@@ -98 +99 @@
         self.stdout.write('Error: ')
         self.stdout.write(what)
-        
-    
+        self.stdout.write('\n')
+
     def emptyline(self):
         """Override the default impl of reexecuting last command."""
@@ -124 +125 @@
         """
 
-        self.__log('Exiting...\n')
+        self.__log('Exiting...')
         return True
 
@@ -142 +143 @@
             
         readline.write_history_file(arg)
-        self.__log('History saved in: %s\n' % arg)
+        self.__log('History saved in: %s' % arg)
         
     def do_cd(self, arg):
@@ -183 +184 @@
             self.sub_directory = arg
 
-        self.__log('Sub directory: %s\n' % self.sub_directory)
+        self.__log('Sub directory: %s' % self.sub_directory)
 
     def do_logfile(self, arg):
@@ -203 +204 @@
             self.logger.setLevel(logging.INFO)
             
-        self.__log('Logging to: %s\n' % self.logfile)
+        self.__log('Logging to: %s' % self.logfile)
 
     def do_print_executed_commands(self, arg):
@@ -217 +218 @@
             SystemCommand.VERBOSE = yesno(arg)
 
-        self.__log('Print executed commands: %s\n' % SystemCommand.VERBOSE)
+        self.__log('Print executed commands: %s' % SystemCommand.VERBOSE)
 
     def do_patch_name_format(self, arg):
@@ -237 +238 @@
             SyncronizableTargetWorkingDir.PATCH_NAME_FORMAT = arg
 
-        self.__log('Patch name format: %s\n' %
+        self.__log('Patch name format: %s' %
                    SyncronizableTargetWorkingDir.PATCH_NAME_FORMAT)
         
@@ -257 +258 @@
             SyncronizableTargetWorkingDir.REMOVE_FIRST_LOG_LINE = yesno(arg)
 
-        self.__log('Remove first log line: %s\n' %
+        self.__log('Remove first log line: %s' %
                    SyncronizableTargetWorkingDir.REMOVE_FIRST_LOG_LINE)
 
@@ -273 +274 @@
             Changeset.REFILL_MESSAGE = yesno(arg)
 
-        self.__log('Refill changelogs: %s\n' % Changeset.REFILL_MESSAGE)
+        self.__log('Refill changelogs: %s' % Changeset.REFILL_MESSAGE)
         
     def do_source_kind(self, arg):
@@ -285 +286 @@
             self.source_kind = arg
 
-        self.__log('Current source kind: %s\n' % self.source_kind)
+        self.__log('Current source kind: %s' % self.source_kind)
         
     def do_target_kind(self, arg):
@@ -297 +298 @@
             self.target_kind = arg
 
-        self.__log('Current target kind: %s\n' % self.target_kind)
+        self.__log('Current target kind: %s' % self.target_kind)
 
     def do_source_repository(self, arg):
@@ -313 +314 @@
             self.source_repository = arg
 
-        self.__log('Current source repository: %s\n' % self.source_repository)
+        self.__log('Current source repository: %s' % self.source_repository)
 
     def do_target_repository(self, arg):
@@ -329 +330 @@
             self.target_repository = arg
 
-        self.__log('Current target repository: %s\n' % self.target_repository)
+        self.__log('Current target repository: %s' % self.target_repository)
 
     def do_source_module(self, arg):
@@ -345 +346 @@
             self.source_module = arg
 
-        self.__log('Current source module: %s\n' % self.source_module)
+        self.__log('Current source module: %s' % self.source_module)
 
     def do_target_module(self, arg):
@@ -361 +362 @@
             self.target_module = arg
 
-        self.__log('Current target module: %s\n' % self.target_module)
+        self.__log('Current target module: %s' % self.target_module)
 
     def loadStateFile(self):
@@ -375 +376 @@
             sf.close()
 
-            self.__log('Source revision: %s\n' % self.source_revision)
+            self.__log('Source revision: %s' % self.source_revision)
             if self.changesets:
-                self.__log('Pending changesets: %d\n' % len(self.changesets))
+                self.__log('Pending changesets: %d' % len(self.changesets))
         except IOError:
             self.source_revision = None
@@ -415 +416 @@
             self.state_file = arg
             
-        self.__log('Current state file: %s\n' % self.state_file)
+        self.__log('Current state file: %s' % self.state_file)
 
         self.loadStateFile()
@@ -432 +433 @@
 
         if not self.state_file:
-            self.__err('Need a state_file to proceed!\n')
+            self.__err('Need a state_file to proceed!')
             return
 
@@ -448 +449 @@
 
         dwd = DualWorkingDir(self.source_kind, self.target_kind)
-        self.__log("Getting %s revision '%s' of '%s' from '%s'\n" % (
+        self.__log("Getting %s revision '%s' of '%s' from '%s'" % (
             self.source_kind, revision,
             self.source_module, self.source_repository))
@@ -481 +482 @@
         """
 
-        self.__log("Changeset %s:\n%s\n" % (changeset.revision,
+        self.__log("Changeset %s:\n%s" % (changeset.revision,
                                             changeset.log))
         return True
@@ -490 +491 @@
         """
 
-        self.stdout.write("\nChangeset %s:\n%s\n" % (changeset.revision,
+        self.stdout.write("\nChangeset %s:\n%s" % (changeset.revision,
                                                      changeset.log))
 
@@ -538 +539 @@
 
         if not self.state_file:
-            self.__err('Need a state_file to proceed!\n')
+            self.__err('Need a state_file to proceed!')
             return
                 
@@ -587 +588 @@
                         applyable = self.shouldApply
 
-            self.__log('Applying %d changesets (out of %d)\n' %
+            self.__log('Applying %d changesets (out of %d)' %
                        (len(changesets), nchanges))
 
@@ -613 +614 @@
                 if self.changesets:
                     self.__log("There are still %d pending changesets, "
-                               "now at revision '%s'\n" %
+                               "now at revision '%s'" %
                                (len(self.changesets), self.source_revision))
                 else:
-                    self.__log("Update completed, now at revision '%s'\n" %
+                    self.__log("Update completed, now at revision '%s'" %
                                self.source_revision)
         else: