diff -r 0ad4469a2ae1 -r 679cec4c93dc scripts/functions
--- a/scripts/functions	Tue Apr 13 00:07:00 2010 +0200
+++ b/scripts/functions	Tue Apr 13 20:05:47 2010 +0200
@@ -724,14 +724,16 @@
     local bundled_patch_dir
     local local_patch_dir
 
-    pkgname="$1"
-    version="$2"
-    pkgdir="${pkgname}-${version}"
-
     if [ "${nochdir}" = "nochdir" ]; then
         shift
+        pkgname="$1"
+        version="$2"
+        pkgdir="${pkgname}-${version}"
         nochdir="$(pwd)"
     else
+        pkgname="$1"
+        version="$2"
+        pkgdir="${pkgname}-${version}"
         nochdir="${CT_SRC_DIR}/${pkgdir}"
     fi