--- a/clone_packages/clone_all_packages.pl	Thu Sep 03 11:39:00 2009 +0100
+++ b/clone_packages/clone_all_packages.pl	Mon Sep 07 14:01:18 2009 +0100
@@ -63,6 +63,8 @@
 
 %REPO%         relative path to the repository
 %WREPO%        relative path to repository, with Windows path separators
+%HREPO%        path to the repository on the server
+%WHREPO%       path to the repository on the server, with Windows separators
 %URL%          URL of the master repository
 %PUSHURL%      URL suitable for pushing (always includes username & password)
 %REV%          revision associated with the repository (defaults to "tip")
@@ -219,13 +221,17 @@
     {
     # iteration functionality - process the keywords
     my $wpath = $path;
+    my $wpackage = $package;
     $wpath =~ s/\//\\/g;  # win32 path separator
+    $wpackage =~ s/\//\\/g;  # win32 path separator
     my @repo_cmd = ();
     foreach my $origcmd (@exec_cmd)
       {
       my $cmd = $origcmd; # avoid altering the original
       $cmd =~ s/%REPO%/$path/;
       $cmd =~ s/%WREPO%/$wpath/;
+      $cmd =~ s/%HREPO%/$package/;
+      $cmd =~ s/%WHREPO%/$wpackage/;
       $cmd =~ s/%URL%/$repo_url/;
       $cmd =~ s/%PUSHURL%/$repo_push_url/;
       $cmd =~ s/%REV%/$revision/;