summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2011-09-15 11:17:17 +0100
committerLars Wirzenius <liw@liw.fi>2011-09-15 11:17:17 +0100
commit8aecea70c068be88d1756a2677f3fd145b81ed61 (patch)
treef9a547cbc1ff8a0e776132ecc3e6c9e25238a31d
parent5ee4b1e3a9d2dc2622929b9fa274127d7385b5a6 (diff)
downloadliw-automation-8aecea70c068be88d1756a2677f3fd145b81ed61.tar.gz
Put the attachment directory into bzr as well.
-rwxr-xr-xscripts/journal-note7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/journal-note b/scripts/journal-note
index b3fa466..d71ec0a 100755
--- a/scripts/journal-note
+++ b/scripts/journal-note
@@ -155,12 +155,15 @@ class App(object):
os.rename(draft, finished)
draft_dir, ext = os.path.splitext(draft)
+ finished_dir, ext = os.path.splitext(finished)
if os.path.exists(draft_dir):
- finished_dir, ext = os.path.splitext(finished)
shutil.copytree(draft_dir, finished_dir)
src = os.path.join(opts.base, 'src')
- subprocess.check_call(['bzr', 'add', finished], cwd=src)
+ argv = ['bzr', 'add', finished]
+ if os.path.exists(finished_dir):
+ argv.append(finished_dir)
+ subprocess.check_call(argv, cwd=src)
subprocess.check_call(['bzr', 'commit', '-m', 'new note'], cwd=src)
subprocess.check_call(['ikiwiki', '--setup', '../ikiwiki.setup',
'--refresh'],