v5 v6: version & changelog (& rakefile)

1 files changed, 16 insertions, 15 deletions

diff --git a/rbuild b/rbuild
index 687ecda1..74afe9be 100644
--- a/rbuild
+++ b/rbuild
@@ -37,8 +37,8 @@
 #require 'mkmf'
 #create_makefile("sisu")
 #% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file)
-SiSU_version_next_stable     = '5.5.1' #% set version
-SiSU_version_next_unstable   = '6.1.1' #% set version
+SiSU_version_next_stable     = '5.5.2' #% set version
+SiSU_version_next_unstable   = '6.1.2' #% set version
 #% rake file
 SiSU_version_generic_next_stable     = '5.4.x'
 SiSU_version_generic_next_unstable   = '6.0.x'
@@ -148,11 +148,11 @@ module Utils
     resp='redo'
     print ask + " ['yes', 'no' or 'quit']: "
     resp=File.new('/dev/tty').gets.strip #resp=gets.strip
-    if resp == 'yes'; true
-    elsif resp == 'no'; false
-    elsif resp =~/^quit|exit$/; exit
-    else puts "[please type: 'yes', 'no' or 'quit']"
-      answer?(ask)
+    if resp == 'yes'           then true
+    elsif resp == 'no'         then false
+    elsif resp =~/^quit|exit$/ then exit
+    else                       puts "[please type: 'yes', 'no' or 'quit']"
+                               answer?(ask)
     end
   end
   def self.default_notice
@@ -297,14 +297,15 @@ with:
 #{vi_content_next}
 proceed? }
       resp=Utils.answer?(ans)
-      exit unless resp
-      fn="#{Dir.pwd}/#{filename}"
-      if File.writable?("#{Dir.pwd}/.")
-        file_version=File.new(fn,'w+')
-        file_version << vi_content_next
-        file_version.close
-      else
-        puts %{*WARN* is the file or directory writable? could not create #{filename}}
+      if resp
+        fn="#{Dir.pwd}/#{filename}"
+        if File.writable?("#{Dir.pwd}/.")
+          file_version=File.new(fn,'w+')
+          file_version << vi_content_next
+          file_version.close
+        else
+          puts %{*WARN* is the file or directory writable? could not create #{filename}}
+        end
       end
     end
     def self.update_stable