Merge pull request #2 from ardi69/0.4.10

makes the plugins runable

2 files changed, 10 insertions, 3 deletions

diff --git a/pyload/config/Parser.py b/pyload/config/Parser.py
index e21eaba9f..84c08f17c 100644
--- a/pyload/config/Parser.py
+++ b/pyload/config/Parser.py
@@ -295,6 +295,13 @@ class ConfigParser(object):
         self.save()
 
 
+    def removeDeletedPlugins(self, plugins):
+        for name in self.plugin.keys():
+            if not name in plugins:
+                print "delete config " + name
+                del self.plugin[name]
+    
+    
     def getMetaData(self, section, option):
         """ get all config data for an option """
         return self.config[section][option]
diff --git a/pyload/config/Setup.py b/pyload/config/Setup.py
index 7f5c0b0ed..3ce35bfe1 100644
--- a/pyload/config/Setup.py
+++ b/pyload/config/Setup.py
@@ -506,8 +506,8 @@ class SetupAssistant(object):
             pwlen = 8
             while p1 != p2:
                 sys.stdout.write(_("Password: "))
-                p1 = getpass("")
-
+                p1 = getpass("").strip("\n\r")
+                print("passwd:'%s'" % p1)
                 if len(p1) < pwlen:
                     print _("Password too short! Use at least %s symbols." % pwlen)
                     continue
@@ -516,7 +516,7 @@ class SetupAssistant(object):
                     continue
 
                 sys.stdout.write(_("Password (again): "))
-                p2 = getpass("")
+                p2 = getpass("").strip("\n\r")
 
                 if p1 == p2:
                     return p1