[SCM] morituri/master: * morituri/common/task.py: Add debug. * morituri/rip/drive.py: Show all drives, not just the ones that happen to have an Audio CD inserted.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 05dfeaa3a2f69c3ce6fb4c2148068e85510c37de
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Tue May 26 21:30:49 2009 +0000

    	* morituri/common/task.py:
    	  Add debug.
    	* morituri/rip/drive.py:
    	  Show all drives, not just the ones that happen to have an Audio CD
    	  inserted.

diff --git a/ChangeLog b/ChangeLog
index f7760db..81c9cb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-26  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/common/task.py:
+	  Add debug.
+	* morituri/rip/drive.py:
+	  Show all drives, not just the ones that happen to have an Audio CD
+	  inserted.
+
 2009-05-25  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/rip/cd.py:
diff --git a/morituri/common/task.py b/morituri/common/task.py
index c0ea76f..4a3681d 100644
--- a/morituri/common/task.py
+++ b/morituri/common/task.py
@@ -362,6 +362,7 @@ class SyncRunner(TaskRunner):
             self._report()
 
     def stopped(self, task):
+        self.debug('stopped task %r', task)
         self.progressed(task, 1.0)
         self._loop.quit()
 
diff --git a/morituri/rip/drive.py b/morituri/rip/drive.py
index 009e0ec..94b99e8 100644
--- a/morituri/rip/drive.py
+++ b/morituri/rip/drive.py
@@ -29,7 +29,11 @@ class List(logcommand.LogCommand):
     summary = "list drives"
 
     def do(self, args):
-        paths = cdio.get_devices_with_cap(pycdio.FS_AUDIO, False)
+        print 'getting paths'
+        
+        # using FS_AUDIO here only makes it list the drive when an audio cd
+        # is inserted
+        paths = cdio.get_devices_with_cap(pycdio.FS_MATCH_ALL, False)
         for path in paths:
             device = cdio.Device(path)
             ok, vendor, model, release = device.get_hwinfo()

-- 
morituri packaging