Removed a leftover from an earlier fix, added an extra check to ensure

that a symlink exists

generatecypher.py

@@ -197,7 +197,7 @@ def createoutput(outputdir, outputformat, machine_to_binary, linked_libraries,
                                         if fl in machine_to_binary[architecture][o][endian][elfclass]:
                                             libfound = True
                                             break
-                                        if symlink_to_target[fl] in machine_to_binary[architecture][o][endian][elfclass]:
+                                        if fl in symlink_to_target and symlink_to_target[fl] in machine_to_binary[architecture][o][endian][elfclass]:
                                             libfound = True
                                             fl = symlink_to_target[fl]
                                             break
@@ -539,10 +539,7 @@ def main(argv):
                             break
                         else:
                             # the target is an actual file
-                            if dirtoscan == '/':
-                                symlink_to_target[relfullfilename] = targetfile
-                            else:
-                                symlink_to_target[relfullfilename] = targetfile[topdirlength:]
+                            symlink_to_target[relfullfilename] = targetfile[topdirlength:]
                             break
                     if not os.path.basename(fullfilename) in filename_to_full_path:
                         filename_to_full_path[os.path.basename(fullfilename)] = set()