bug fixes

Signed-off-by: Mattias Andrée <maandree@operamail.com>
This commit is contained in:
Mattias Andrée 2013-04-04 00:08:26 +02:00
parent c38b34a000
commit dc6afac7b7
2 changed files with 2 additions and 5 deletions

View file

@ -649,7 +649,6 @@ class Setup():
ponyshare = conf['share-dir'] ponyshare = conf['share-dir']
if not ponyshare.endswith('/'): if not ponyshare.endswith('/'):
ponyshare += '/' ponyshare += '/'
ponyshare += 'ponysay/'
for dir in sharedirs: for dir in sharedirs:
if conf[dir[0]] is not None: if conf[dir[0]] is not None:
self.cp(True, dir[0], [ponyshare + dir[0]], Setup.validateFreedom if self.free else None) self.cp(True, dir[0], [ponyshare + dir[0]], Setup.validateFreedom if self.free else None)

View file

@ -509,10 +509,8 @@ class Ponysay():
ponies = {} ponies = {}
for ponydir in ponydirs: for ponydir in ponydirs:
for pony in Metadata.restrictedPonies(ponydir, logic): for pony in Metadata.restrictedPonies(ponydir, logic):
if pony in oldponies: # XXX and (pony not in passed) if (pony in ponies) and not (pony in ponies): # XXX and (pony not in passed)
ponyfile = ponydir + pony + '.pony' ponies[pony] = ponydir + pony + '.pony'
if oldponies[pony] == ponyfile:
ponies[pony] = ponyfile
if len(ponies) > 0: if len(ponies) > 0:
oldponies = ponies oldponies = ponies