Changeset 983 for lliurex-meta-maker


Ignore:
Timestamp:
Mar 29, 2016, 6:31:25 PM (4 years ago)
Author:
kbut
Message:

wip

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lliurex-meta-maker/trunk/fuentes/src/metamaker/__init__.py

    r975 r983  
    122122                                line = re.sub(r"^"+seed+":",baseflavour+"-"+seed+":",line)
    123123                                line = re.sub(r"(\s*)"+seed+r"(\s+|$)",r"\1"+baseflavour+"-"+seed+r"\2",line)
    124                                 print(line,end="")
     124                        print(line,end="")
    125125                shutil.move(basedir,self.root + "/seeds/")
    126126
     
    129129                        website = "http://people.canonical.com/~ubuntu-archive/seeds/"
    130130                        openwebsite = urllib.request.urlopen(website)
    131                         soup = BeautifulSoup(openwebsite)
     131                        soup = BeautifulSoup(openwebsite,'html.parser')
    132132                        links = soup.findAll('a')[4:]
    133133                        for link in links:
     
    182182                if answer == "" or answer == "y" or answer == "yes":
    183183                        dist = self.config.get("DEFAULT","dist")
    184                         self.config.set(dist,"output_seeds"," ".join(defaultOutSeeds))
     184                        self.config.set(dist,"seeds"," ".join(defaultOutSeeds))
    185185                        self.saveConfig()
    186186
     
    195195        def ensureOutputSeeds(self):
    196196                dist = self.config.get("DEFAULT","dist")
    197                 outputseeds = self.config.get(dist,"output_seeds")
    198                 for seed in self.config.get(dist,"output_seeds").strip().split(" "):
     197                outputseeds = self.config.get(dist,"seeds")
     198                for seed in self.config.get(dist,"seeds").strip().split(" "):
    199199                        if not seed in self.seeds and seed != "":
    200200                                seedpath = self.root + "/seeds/lliurex/"+ seed
Note: See TracChangeset for help on using the changeset viewer.