tags 295932 +patch
thanks

Hi,
I just uploaded the attached patch to ubuntu to deal with this issue.
Cheers,
-Thom


diff -ur powermgmt-base-1.21/debian/changelog 
powermgmt-base-1.21ubuntu1/debian/changelog
--- powermgmt-base-1.21/debian/changelog        2004-06-07 14:34:44.000000000 
+0100
+++ powermgmt-base-1.21ubuntu1/debian/changelog 2005-03-02 16:50:24.750741480 
+0000
@@ -1,3 +1,9 @@
+powermgmt-base (1.21ubuntu1) hoary; urgency=low
+
+  * Ensure on_ac_power works correctly on desktop G4/G5 systems (Ubuntu: 7046)
+
+ -- Thom May <[EMAIL PROTECTED]>  Wed,  2 Mar 2005 16:49:49 +0000
+
 powermgmt-base (1.21) unstable; urgency=low
 
   * New Turkish translation.  (closes: Bug#249127)
diff -ur powermgmt-base-1.21/src/on_ac_power 
powermgmt-base-1.21ubuntu1/src/on_ac_power
--- powermgmt-base-1.21/src/on_ac_power 2002-11-01 20:59:01.000000000 +0000
+++ powermgmt-base-1.21ubuntu1/src/on_ac_power  2005-03-02 15:36:41.157229912 
+0000
@@ -36,6 +36,22 @@
     [ "${OFF_LINE_P}" = "yes" ] && exit 1
 fi
 
+# PMU
+if [ -r /proc/pmu/info ]; then
+    exec awk </proc/pmu/info '
+       BEGIN { FS=":"; ret = 255 }
+       /^AC Power.*1$/ { ret = 0; exit }
+       /^AC Power.*0$/ { ac = 1 }
+        /^Battery.*/ {
+                if ($2 ~/0/ && ac == 1)
+                        ret = 0
+                else
+                        ret = 1
+                exit }
+       END { exit ret }
+    '
+fi
+
 # APM
 if apm_available && [ -r /proc/apm ]; then
     exec awk </proc/apm '
@@ -48,15 +64,6 @@
     '
 fi
 
-# PMU
-if [ -r /proc/pmu/info ]; then
-    exec awk </proc/pmu/info '
-       BEGIN { ret = 255 }
-       /^AC Power.*1$/ { ret = 0; exit }
-       /^AC Power.*0$/ { ret = 1; exit }
-       END { exit ret }
-    '
-fi
 
 # nothing is available
 exit 255
diff -ur powermgmt-base-1.21/debian/changelog 
powermgmt-base-1.21ubuntu1/debian/changelog
--- powermgmt-base-1.21/debian/changelog        2004-06-07 14:34:44.000000000 
+0100
+++ powermgmt-base-1.21ubuntu1/debian/changelog 2005-03-02 16:50:24.750741480 
+0000
@@ -1,3 +1,9 @@
+powermgmt-base (1.21ubuntu1) hoary; urgency=low
+
+  * Ensure on_ac_power works correctly on desktop G4/G5 systems (Ubuntu: 7046)
+
+ -- Thom May <[EMAIL PROTECTED]>  Wed,  2 Mar 2005 16:49:49 +0000
+
 powermgmt-base (1.21) unstable; urgency=low
 
   * New Turkish translation.  (closes: Bug#249127)
diff -ur powermgmt-base-1.21/src/on_ac_power 
powermgmt-base-1.21ubuntu1/src/on_ac_power
--- powermgmt-base-1.21/src/on_ac_power 2002-11-01 20:59:01.000000000 +0000
+++ powermgmt-base-1.21ubuntu1/src/on_ac_power  2005-03-02 15:36:41.157229912 
+0000
@@ -36,6 +36,22 @@
     [ "${OFF_LINE_P}" = "yes" ] && exit 1
 fi
 
+# PMU
+if [ -r /proc/pmu/info ]; then
+    exec awk </proc/pmu/info '
+       BEGIN { FS=":"; ret = 255 }
+       /^AC Power.*1$/ { ret = 0; exit }
+       /^AC Power.*0$/ { ac = 1 }
+        /^Battery.*/ {
+                if ($2 ~/0/ && ac == 1)
+                        ret = 0
+                else
+                        ret = 1
+                exit }
+       END { exit ret }
+    '
+fi
+
 # APM
 if apm_available && [ -r /proc/apm ]; then
     exec awk </proc/apm '
@@ -48,15 +64,6 @@
     '
 fi
 
-# PMU
-if [ -r /proc/pmu/info ]; then
-    exec awk </proc/pmu/info '
-       BEGIN { ret = 255 }
-       /^AC Power.*1$/ { ret = 0; exit }
-       /^AC Power.*0$/ { ret = 1; exit }
-       END { exit ret }
-    '
-fi
 
 # nothing is available
 exit 255

Attachment: signature.asc
Description: Digital signature

Reply via email to