From e87ae0640ede32c2d80456fe656c73211ef1d1db Mon Sep 17 00:00:00 2001
From: root <root@yunohost.yayayo.fr>
Date: Thu, 25 Oct 2012 19:54:36 +0200
Subject: [PATCH] fix maindomain function
---
yunohost_tools.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/yunohost_tools.py b/yunohost_tools.py
index d1492bb7..60ce5b54 100644
--- a/yunohost_tools.py
+++ b/yunohost_tools.py
@@ -94,7 +94,7 @@ def tools_maindomain(args):
if not args['old_domain']:
with open('/usr/share/yunohost/yunohost-config/others/current_host', 'r') as f:
- args['old_domain'] = f.readline()
+ args['old_domain'] = f.readline().rstrip()
validate({
args['new_domain'] : r'^([a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)(\.[a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)*(\.[a-zA-Z]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)$',