mcf: Remove update parameter from downloadrepo function (v4.0.9)

:Release Notes:
downloadrepo function called with update parameter set to True just
calls updaterepo, let the caller to call right function directly.

:Detailed Notes:

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[ES-515] mcf: Fix problem with local repository is out-of-sync with
         remote

Open-webOS-DCO-1.0-Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Change-Id: If7ebbb5d8b26aed0755bac93a50e63067edc4b3d
Reviewed-on: https://g2g.palm.com/5447
Reviewed-by: DCO Verification
Build: Martin Jansa <Martin.Jansa@lge.com>
Reviewed-by: Martin Jansa <Martin.Jansa@lge.com>
Tested-by: Martin Jansa <Martin.Jansa@lge.com>
Reviewed-by: Build Verification
Reviewed-by: Susan Montooth <susan.montooth@lge.com>

Author: shr-project

mcf

@@ -25,7 +25,7 @@ from time import gmtime, strftime
 import shutil
 import glob
 
-__version__ = "4.0.8"
+__version__ = "4.0.9"
 
 logger = logging.getLogger(__name__)
 
@@ -330,75 +330,71 @@ def parsesubmissions(layer):
     COMMITIDSNEW[layer] = COMMIT
     TAGSINFONEW[layer] = TAG
 
-def downloadrepo(layer,update=False):
-    if not update:
-        cmd = 'git clone %s %s' % (URLS[layer], LOCATIONS[layer])
-        echo_check_call(cmd)
-
-        olddir = os.getcwd()
-        os.chdir(LOCATIONS[layer])
+def downloadrepo(layer):
+    cmd = 'git clone %s %s' % (URLS[layer], LOCATIONS[layer])
+    echo_check_call(cmd)
 
-        newbranch = BRANCHINFONEW[layer]
+    olddir = os.getcwd()
+    os.chdir(LOCATIONS[layer])
+    newbranch = BRANCHINFONEW[layer]
 
-        if newbranch:
-            refbranchlist = echo_check_call("git branch")
+    if newbranch:
+        refbranchlist = echo_check_call("git branch")
+        refbranch = refbranchlist.splitlines()
+        foundbranch = False
+        for ibranch in refbranch:
+            if newbranch in ibranch:
+                foundbranch = True
+        if not foundbranch:
+            refbranchlist = echo_check_call("git branch -r")
             refbranch = refbranchlist.splitlines()
-            foundbranch = False
             for ibranch in refbranch:
-                if newbranch in ibranch:
+                if ibranch == "  %s/%s" % (REMOTE, newbranch):
                     foundbranch = True
-            if not foundbranch:
-                refbranchlist = echo_check_call("git branch -r")
-                refbranch = refbranchlist.splitlines()
-                for ibranch in refbranch:
-                    if ibranch == "  %s/%s" % (REMOTE, newbranch):
-                        foundbranch = True
-                        logger.info( " found %s " % ibranch )
-                        cmd ='git checkout -B %s %s' % (newbranch,ibranch)
-                        echo_check_call(cmd)
-                        break
-
-        currentbranch = echo_check_call("git rev-parse --abbrev-ref HEAD").rstrip()
-        newcommitid = COMMITIDSNEW[layer]
-        if newcommitid:
-            if newcommitid.startswith('refs/changes/'):
-                if newbranch and newbranch != currentbranch:
-                    # older git doesn't allow to update reference on currently checked out branch
-                    cmd ='git fetch %s %s && git checkout -B %s FETCH_HEAD' % (REMOTE, newcommitid, newbranch)
-                elif newbranch:
-                    # we're already on requested branch
-                    cmd ='git fetch %s %s && git reset --hard FETCH_HEAD' % (REMOTE, newcommitid)
-                else:
-                    # we don't have any branch preference use detached
-                    cmd ='git fetch %s %s && git checkout FETCH_HEAD' % (REMOTE, newcommitid)
-                echo_check_call(cmd)
-            else:
-                if newbranch and newbranch != currentbranch:
-                    # older git doesn't allow to update reference on currently checked out branch
-                    cmd ='git checkout -B %s %s' % (newbranch,newcommitid)
-                elif newbranch:
-                    # we're already on requested branch
-                    cmd ='git reset --hard %s' % newcommitid
-                else:
-                    # we don't have any branch preference use detached
-                    cmd ='git checkout %s' % newcommitid
-                echo_check_call(cmd)
+                    logger.info( " found %s " % ibranch )
+                    cmd ='git checkout -B %s %s' % (newbranch,ibranch)
+                    echo_check_call(cmd)
+                    break
 
-        newtag = TAGSINFONEW[layer]
-        if newtag:
+    currentbranch = echo_check_call("git rev-parse --abbrev-ref HEAD").rstrip()
+    newcommitid = COMMITIDSNEW[layer]
+    if newcommitid:
+        if newcommitid.startswith('refs/changes/'):
             if newbranch and newbranch != currentbranch:
                 # older git doesn't allow to update reference on currently checked out branch
-                cmd ='git checkout -B %s %s' % (newbranch,newtag)
+                cmd ='git fetch %s %s && git checkout -B %s FETCH_HEAD' % (REMOTE, newcommitid, newbranch)
             elif newbranch:
                 # we're already on requested branch
-                cmd ='git reset --hard %s' % newtag
+                cmd ='git fetch %s %s && git reset --hard FETCH_HEAD' % (REMOTE, newcommitid)
             else:
-                cmd ='git checkout %s' % newtag
+                # we don't have any branch preference use detached
+                cmd ='git fetch %s %s && git checkout FETCH_HEAD' % (REMOTE, newcommitid)
+            echo_check_call(cmd)
+        else:
+            if newbranch and newbranch != currentbranch:
+                # older git doesn't allow to update reference on currently checked out branch
+                cmd ='git checkout -B %s %s' % (newbranch,newcommitid)
+            elif newbranch:
+                # we're already on requested branch
+                cmd ='git reset --hard %s' % newcommitid
+            else:
+                # we don't have any branch preference use detached
+                cmd ='git checkout %s' % newcommitid
             echo_check_call(cmd)
 
-        os.chdir(olddir)
-    else:
-        updaterepo(layer)
+    newtag = TAGSINFONEW[layer]
+    if newtag:
+        if newbranch and newbranch != currentbranch:
+            # older git doesn't allow to update reference on currently checked out branch
+            cmd ='git checkout -B %s %s' % (newbranch,newtag)
+        elif newbranch:
+            # we're already on requested branch
+            cmd ='git reset --hard %s' % newtag
+        else:
+            cmd ='git checkout %s' % newtag
+        echo_check_call(cmd)
+
+    os.chdir(olddir)
 
 def parselayerconffile(layer, layerconffile):
     with open(layerconffile, 'r') as f:
@@ -499,7 +495,7 @@ def update_layers(sourcedir):
     # update layers
     for layer in WEBOSLAYERS:
         if layer in updated_layers:
-            downloadrepo(layer,True)
+            updaterepo(layer)
     printupdatesummary()
 
 def printupdatesummary ():