Fix extra imports and undefined variable found by pyflakes.

svn path=/main/trunk/; revision=3623

diff --git a/bin/emerge b/bin/emerge
index b5e043190aaf05f28f3cb83364df08a0b0db2b92..dbc7500462e25d856afdd982d1a9b672a5c81df4 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -13,7 +13,7 @@ try:
 except KeyboardInterrupt:
        sys.exit(1) # If they control C during imports, just die silently
 
-import emergehelp,xpak,string,re,commands,time,shutil,traceback,signal,socket,types
+import emergehelp, xpak, commands, re, signal, socket, string, time, types
 from stat import ST_MTIME
 from output import blue, bold, colorize, darkblue, darkgreen, darkred, green, \
        havecolor, nc_len, nocolor, red, teal, turquoise, white, xtermTitle, \
@@ -2416,7 +2416,7 @@ def unmerge(unmerge_action, unmerge_files, raise_on_missing=True):
 
                                if sp_absx_len <= sp_vdb_len:
                                        # The Path is shorter... so it can't be inside the vdb.
-                                       print spabsx
+                                       print sp_absx
                                        print absx
                                        print "\n!!!",x,"cannot be inside "+(portage.root+portage.VDB_PATH)+"; aborting.\n"
                                        return 0