From d00837f8fcf1c25108326b2a26607abdf486281e Mon Sep 17 00:00:00 2001 From: Dimitri Fontaine Date: Sun, 13 Jul 2014 16:35:53 +0200 Subject: [PATCH] Fix --upgrade-config basic usage. --- src/main.lisp | 7 ++++++- src/parse-ini.lisp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main.lisp b/src/main.lisp index 309a4b5..ca9b46a 100644 --- a/src/main.lisp +++ b/src/main.lisp @@ -192,7 +192,12 @@ (when upgrade-config (loop for filename in arguments do - (pgloader.ini:convert-ini-into-commands filename) + (handler-case + (with-monitor () + (pgloader.ini:convert-ini-into-commands filename)) + (condition (c) + (when debug (invoke-debugger c)) + (uiop:quit 1))) (format t "~%~%")) (uiop:quit)) diff --git a/src/parse-ini.lisp b/src/parse-ini.lisp index 3e7bf9e..8bd0e0f 100644 --- a/src/parse-ini.lisp +++ b/src/parse-ini.lisp @@ -237,7 +237,7 @@ (loop for (param option section default) in `((:host "host" ,*global-section* ,*pgconn-host*) - (:port "port" ,*global-section* ,*pgconn-port*) + (:port "port" ,*global-section* ,(format nil "~d" *pgconn-port*)) (:user "user" ,*global-section* ,*pgconn-user*) (:pass "pass" ,*global-section* ,*pgconn-pass*) (:dbname "base" ,*global-section* nil))