4e8ad3
diff -up Python-2.7.3/Modules/getpath.c.fix-for-usr-move Python-2.7.3/Modules/getpath.c
4e8ad3
--- Python-2.7.3/Modules/getpath.c.fix-for-usr-move	2013-03-06 14:25:32.801828698 -0500
1b2a27
+++ Python-2.7.3/Modules/getpath.c	2013-03-06 15:59:30.872443168 -0500
4e8ad3
@@ -510,6 +510,24 @@ calculate_path(void)
4e8ad3
        MAXPATHLEN bytes long.
4e8ad3
     */
4e8ad3
 
4e8ad3
+    /*
4e8ad3
+      Workaround for rhbz#817554, where an empty argv0_path erroneously
4e8ad3
+      locates "prefix" as "/lib[64]/python2.7" due to it finding
4e8ad3
+      "/lib[64]/python2.7/os.py" via the /lib -> /usr/lib symlink for
4e8ad3
+      https://fedoraproject.org/wiki/Features/UsrMove
4e8ad3
+    */
1b2a27
+    if (argv0_path[0] == '\0' && 0 == strcmp(prog, "cmpi_swig")) {
4e8ad3
+        /*
4e8ad3
+          We have an empty argv0_path, presumably because prog aka
4e8ad3
+          Py_GetProgramName() was not found on $PATH.
4e8ad3
+
4e8ad3
+          Set argv0_path to "/usr/" so that search_for_prefix() and
4e8ad3
+          search_for_exec_prefix() don't erroneously pick up
4e8ad3
+          on /lib/ via the UsrMove symlink:
4e8ad3
+        */
4e8ad3
+        strcpy(argv0_path, "/usr/");
4e8ad3
+    }
4e8ad3
+
4e8ad3
     if (!(pfound = search_for_prefix(argv0_path, home))) {
4e8ad3
         if (!Py_FrozenFlag)
4e8ad3
             fprintf(stderr,