Changeset 983

Timestamp:

Mar 29, 2016, 6:31:25 PM (5 years ago)

Author:

kbut

Message:

wip

File:

• lliurex-meta-maker/trunk/fuentes/src/metamaker/__init__.py (modified) (4 diffs)

lliurex-meta-maker/trunk/fuentes/src/metamaker/__init__.py

@@ -122 +122 @@
                                 line = re.sub(r"^"+seed+":",baseflavour+"-"+seed+":",line)
                                 line = re.sub(r"(\s*)"+seed+r"(\s+|$)",r"\1"+baseflavour+"-"+seed+r"\2",line)
-                                print(line,end="")
+                        print(line,end="")
                 shutil.move(basedir,self.root + "/seeds/")
 
@@ -129 +129 @@
                         website = "http://people.canonical.com/~ubuntu-archive/seeds/"
                         openwebsite = urllib.request.urlopen(website)
-                        soup = BeautifulSoup(openwebsite)
+                        soup = BeautifulSoup(openwebsite,'html.parser')
                         links = soup.findAll('a')[4:]
                         for link in links:
@@ -182 +182 @@
                 if answer == "" or answer == "y" or answer == "yes":
                         dist = self.config.get("DEFAULT","dist")
-                        self.config.set(dist,"output_seeds"," ".join(defaultOutSeeds))
+                        self.config.set(dist,"seeds"," ".join(defaultOutSeeds))
                         self.saveConfig()
 
@@ -195 +195 @@
         def ensureOutputSeeds(self):
                 dist = self.config.get("DEFAULT","dist")
-                outputseeds = self.config.get(dist,"output_seeds")
-                for seed in self.config.get(dist,"output_seeds").strip().split(" "):
+                outputseeds = self.config.get(dist,"seeds")
+                for seed in self.config.get(dist,"seeds").strip().split(" "):
                         if not seed in self.seeds and seed != "":
                                 seedpath = self.root + "/seeds/lliurex/"+ seed