Ticket #1401: base.py.patch

turbogears/command/base.py

@@ -129 +129 @@
 
             if sqlobjcommand not in no_model_param:
                 if not "--egg" in sys.argv:
-                    eggname = glob.glob("*.egg-info")
-                    if not eggname or not \
-                        os.path.exists(os.path.join(eggname[0], "sqlobject.txt")):
-                        eggname = self.fix_egginfo(eggname)
-                    eggname = eggname[0].replace(".egg-info", "")
-                    if not "." in sys.path:
-                        sys.path.append(".")
-                        pkg_resources.working_set.add_entry(".")
-                    sys.argv.insert(2, eggname)
-                    sys.argv.insert(2, "--egg")
+                    #eggname = glob.glob("*.egg-info")
+                    eggname = turbogears.util.get_project_name()
+                    if eggname:
+                        sys.argv.insert(2, eggname)
+                        sys.argv.insert(2, "--egg")
+                    else:
+                        if not \
+                            os.path.exists(os.path.join(eggname[0], "sqlobject.txt")):
+                            eggname = self.fix_egginfo(eggname)
+                        eggname = eggname[0].replace(".egg-info", "")
+                        if not "." in sys.path:
+                            sys.path.append(".")
+                            pkg_resources.working_set.add_entry(".")
+                        sys.argv.insert(2, eggname)
+                        sys.argv.insert(2, "--egg")
 
             from sqlobject.manager import command
             command.the_runner.run(sys.argv)