Attachment 299032 Details for Bug 209425 – Poposed patch

[patch] Poposed patch

hal-lock.patch (text/plain), 2.67 KB, created by Jiri Moskovcak on 2008-03-25 14:29:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Moskovcak

Created: 2008-03-25 14:29:13 UTC

Size: 2.67 KB

patch

obsolete

>--- system-config-packages-1.2.23/src/MainWindow.py	2004-12-02 19:30:54.000000000 +0100
>+++ system-config-packages-1.2.23/src/$MainWindow.py	2008-03-25 13:38:22.000000000 +0100
>@@ -105,6 +105,7 @@
>                 pass
>             progress_dialog.destroy()
>             return
>+        self.im.cleanup()
>         gtk.main_quit ()
> 
>     def screen_changed (self, screen=None):
>--- system-config-packages-1.2.23/src/method.py	2008-03-25 13:37:32.000000000 +0100
>+++ system-config-packages-1.2.23/src/$method.py	2008-03-25 13:39:35.000000000 +0100
>@@ -179,6 +179,9 @@
> 
>     def umount(self):
>         pass
>+    
>+    def cleanup(self):
>+        pass
> 
>     def setupTransaction(self, comps, dialog=None):
>         # figure out what we're installing so that we can do a
>@@ -739,6 +742,16 @@
>     def filesDone(self):
>         if self.isMounted != 0:
>             self.umount()
>+    
>+    def cleanup(self):
>+        for dev in getHalCDDevs():
>+            if dev.PropertyExists('info.locked'):
>+                if dev.GetProperty('info.locked'):
>+                    try:
>+                        dev.Unlock()
>+                    except Exception, e:
>+                        print "Can't unlock %s: %s" % (dev.GetProperty()['block.device'],e)
>+                
> 
> class RedHatCdromInstallMethod(CdromInstallMethod):
>     """Install method for installing packages from Red Hat Linux CDroms."""
>@@ -932,9 +945,9 @@
>         discNums.append(int(num))
>     return discNums
> 
>-def getHalDevs():
>+def getHalCDDevs():
>     global cdMntpt
>-    cddevs = {}
>+    halcddevs = []
> 
>     # get the devices from HAL
>     bus = dbus.Bus (dbus.Bus.TYPE_SYSTEM)
>@@ -945,7 +958,12 @@
>     drives = hal_manager.FindDeviceByCapability('storage.cdrom')
>     for d in drives:
>         devobj = hal_service.get_object(d, "org.freedesktop.Hal.Device")
>-        props = devobj.GetAllProperties()
>+        halcddevs.append(devobj)
>+    return halcddevs
>+    
>+def getHalBlockDevs():
>+    cddevs = {}
>+    for devobj in getHalCDDevs():
>         try:
>             # we have to be able to get a lock on it to keep g-v-m from
>             # mounting it from under us
>@@ -954,6 +972,7 @@
>             print "Unable to get lock on device %s: %s" %(props["block.device"],
>                                                           e)
>             continue
>+        props = devobj.GetAllProperties()
>         dev = props["block.device"]
>         while os.path.islink(dev):
>             dev = os.readlink(dev)
>@@ -980,7 +999,7 @@
>     cddevs = {}
>     
>     try:
>-        cddevs = getHalDevs()
>+        cddevs = getHalBlockDevs()
>     except Exception, e:
>         print "error getting devices using HAL, falling back to kudzu: %s" %(e,)
>         cddevs = getKudzuDevs()

Actions: View | Diff

Attachments on bug 209425: 299032