urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

master
Joey Hess 2008-08-03 14:23:38 -04:00
parent efcbb32f7c d9db5f2def
commit 1376247754
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -12,6 +12,8 @@ ikiwiki (2.60) UNRELEASED; urgency=low
* ikiwiki-update-wikilist: Add -r switch to remove. Default behavior is now * ikiwiki-update-wikilist: Add -r switch to remove. Default behavior is now
always to add. always to add.
* Start moving admin preferences from the web interface to the setup file. * Start moving admin preferences from the web interface to the setup file.
* ikiwiki-makerepo: Bail if both srcdir and repository are not specified.
Closes: #493628
-- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400 -- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400

4
ikiwiki-makerepo
View File

@ -21,6 +21,10 @@ if [ ! -d "$srcdir" ]; then
fi fi
if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ]; then if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ]; then
if [ -z "$repository" ]; then
echo "you need to specify both a srcdir and a repository for $rcs" >&2
usage
fi
if [ -e "$repository" ]; then if [ -e "$repository" ]; then
echo "repository $repository already exists, aborting" >&2 echo "repository $repository already exists, aborting" >&2
exit 1 exit 1