-svn cp -p $svnuri/$package $svnuri/package_tags/$Source/$Version -m "Tag $Version of $Source"
-reprepro-env include $Distribution ../$Source*$Version.changes
+
+if ! svn ls $svnuri/package_tags/$Source >/dev/null 2>&1; then
+ svn mkdir $svnuri/package_tags/$Source \
+ -m "Create package tags directory"
+fi
+if ! svn ls $svnuri/package_tags/$Source/$Version >/dev/null 2>&1; then
+ svn cp $svnuri/$package $svnuri/package_tags/$Source/$Version \
+ -m "Tag $Version of $Source"
+else
+ echo "$(basename $0): tag already exists, not making again"
+fi
+
+cd ..
+reprepro-env include $Distribution `pwd`/${Source}_*${Version}*.changes