فهرست منبع

HPCC-9984 Compile direct from a version control system

Minor fixes following code review

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 11 سال پیش
والد
کامیت
ba4cc359d5
4فایلهای تغییر یافته به همراه7 افزوده شده و 9 حذف شده
  1. 1 1
      common/remote/hooks/git/gitfile.cpp
  2. 4 6
      ecl/eclcc/eclcc.cpp
  3. 1 1
      ecl/eclccserver/eclccserver.cpp
  4. 1 1
      ecl/eclccserver/vchooks/git.sh

+ 1 - 1
common/remote/hooks/git/gitfile.cpp

@@ -81,7 +81,7 @@ public:
     IMPLEMENT_IINTERFACE;
     GitRepositoryFileIO(const char * gitDirectory, const char * revision, const char * relFileName)
     {
-        VStringBuffer gitcmd("git --git-dir=%s show %s:%s", gitDirectory, revision ? revision : "HEAD", relFileName);
+        VStringBuffer gitcmd("git --git-dir=%s show %s:%s", gitDirectory, (revision && *revision) ? revision : "HEAD", relFileName);
         Owned<IPipeProcess> pipe = createPipeProcess();
         if (pipe->run("git", gitcmd, ".", false, true, false, 0))
         {

+ 4 - 6
ecl/eclcc/eclcc.cpp

@@ -1686,10 +1686,9 @@ bool EclCC::parseCommandLineOptions(int argc, const char* argv[])
     for (; !iter.done(); iter.next())
     {
         const char * arg = iter.query();
-        if (memcmp(arg, "-a", 2)==0)
+        if (iter.matchFlag(tempArg, "-a"))
         {
-            if (arg[2])
-                applicationOptions.append(arg+2);
+            applicationOptions.append(tempArg);
         }
         else if (iter.matchOption(tempArg, "--allow"))
         {
@@ -1724,10 +1723,9 @@ bool EclCC::parseCommandLineOptions(int argc, const char* argv[])
         else if (iter.matchFlag(optArchive, "-E"))
         {
         }
-        else if (memcmp(arg, "-f", 2)==0)
+        else if (iter.matchFlag(tempArg, "-f"))
         {
-            if (arg[2])
-                debugOptions.append(arg+2);
+            debugOptions.append(tempArg);
         }
         else if (iter.matchFlag(tempBool, "-g"))
         {

+ 1 - 1
ecl/eclccserver/eclccserver.cpp

@@ -300,7 +300,7 @@ class EclccCompileThread : public CInterface, implements IPooledThread, implemen
             unsigned time = msTick();
             Owned<ErrorReader> errorReader = new ErrorReader(pipe, this);
             eclccCmd.insert(0, eclccProgName);
-            pipe->run("eclccProgName", eclccCmd, ".", true, false, true, 0);
+            pipe->run(eclccProgName, eclccCmd, ".", true, false, true, 0);
             errorReader->start();
             try
             {

+ 1 - 1
ecl/eclccserver/vchooks/git.sh

@@ -51,7 +51,7 @@ function fetch_repo {
     fi
 
     if [ -n "$wu_git_branch" ]; then
-        if [ -z git_branch_locked ]; then
+        if [ -z "$git_branch_locked" ]; then
             echo "GIT: Overriding branch is not allowed" 1>&2
             exit 2
         else