Merge branch 'dev'

This commit is contained in:
lilydjwg 2013-03-02 20:32:22 +08:00
commit 1c096c9729
2 changed files with 3 additions and 5 deletions

View file

@ -206,7 +206,7 @@ class EventHandler(pyinotify.ProcessEvent):
owner text,
mtime int,
state int,
info text)''')
info blob)''')
dirs = [os.path.join(base, x) for x in ('any', 'i686', 'x86_64')]
self.files = files = set()
@ -289,9 +289,7 @@ class EventHandler(pyinotify.ProcessEvent):
os.symlink(os.path.join('..', arch, file), newpath)
except FileExistsError:
pass
else:
# XXX: this should be removed as soon as symlinks are supported
self._real_dispatch(newd, ActionInfo(newpath, action))
self._real_dispatch(newd, ActionInfo(newpath, action))
else:
try:
os.unlink(newpath)

View file

@ -27,7 +27,7 @@ def main(conffile):
assert getver(db) == '0.1', 'wrong database version'
input('Please stop the service and then press Enter.')
try:
db.execute('alter table pkginfo add info text')
db.execute('alter table pkginfo add info blob')
except sqlite3.OperationalError:
# the column is already there
pass