Merged 0.10.0-stable [266]:[282] into trunk.

2 files changed, 5 insertions, 3 deletions

diff --git a/scripts/mkrelease.py b/scripts/mkrelease.py
index 4c9cbd5..76bc19f 100755
--- a/scripts/mkrelease.py
+++ b/scripts/mkrelease.py
@@ -12,7 +12,9 @@ success = 0
 current = os.getcwd()
 
 here = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-svnroot = os.path.abspath(os.path.dirname(here))
+parts = here.split('/')
+svn = parts.index('svn')
+svnroot = os.path.join('/', *parts[:svn+1])
 branchroot = os.path.join(svnroot, 'branches')
 tagroot = os.path.join(svnroot, 'tags')
 svntrunk = os.path.join(svnroot, 'trunk')
@@ -93,7 +95,7 @@ runcmd('python setup.py sdist')
 # upload docs and distribution
 if 'NOSE_UPLOAD' in os.environ and False:
     cv = {'version':version,
-          'uoload': os.environ['NOSE_UPLOAD'],
+          'upload': os.environ['NOSE_UPLOAD'],
           'upload_docs': "%s/%s" % (os.environ['NOSE_UPLOAD'], version) }
     cmd = 'scp -C dist/nose-%(version)s.tar.gz %(upload)s' % cv
     runcmd(cmd)
diff --git a/scripts/mkwiki.py b/scripts/mkwiki.py
index f7b2094..de3df94 100755
--- a/scripts/mkwiki.py
+++ b/scripts/mkwiki.py
@@ -325,7 +325,7 @@ class Wiki(object):
         
 def main():
     path = os.path.abspath(
-        os.path.join(os.path.dirname(__file__), '..', '..', 'wiki'))
+        os.path.join(os.path.dirname(__file__), '..', '..', '..', 'wiki'))
     mkwiki(path)