Fix bad merge in 08446fba.

Sometimes, git default merge strategy is really dumb. Or it may be me.

slapos/grid/slapgrid.py

@@ -651,9 +651,6 @@ class Slapgrid(object):
       else:
         timestamp = None
 
-      software_path = os.path.join(self.software_root,
-            getSoftwareUrlHash(software_url))
-
       # Get periodicity from periodicity file if not forced
       if not self.force_periodicity:
         periodicity_path = os.path.join(software_path,'periodicity')