Bug#514543: boinc: Do not check for /RebootPending.txt

[René Mayorga]

tags 514543 - patch
tags 514543 + fixed-upstream fixed-in-experimental
thanks


Hello Daniel!,
and thanks for your bug report,

On Sun, Feb 08, 2009 at 06:14:59PM +0100, Daniel Hahler wrote:
 According to a comment in the bug this is only required for Windows and
 therefore I've added a patch in Ubuntu to remove this check.
 

Yes that check is only for windows AFAICS. 

 In Ubuntu, we've applied the attached patch to achieve the following:
[..]

There is already a fix on upstream[0], that looks more clean then just
removing the entire check, also this change is already on experimental,
and the version on experimental should push up to unstable after lenny
release (hopefully the next week :) )

[0] http://boinc.berkeley.edu/trac/changeset/15628

Cheers.
-- 
Rene Mauricio Mayorga   |  jabber: rmayo...@jabber.org
http://rmayorga.org |  
--
08B6 58AB A691 DD56 C30B  8D37 8040 19FA A209 C305


signature.asc
Description: Digital signature

Bug#514543: boinc: Do not check for /RebootPending.txt

[Daniel Hahler]

Package: boinc
Version: 6.2.14-3
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu jaunty ubuntu-patch

At https://launchpad.net/bugs/297447 an error Error: can't open file
'/RebootPending.txt' (error 2: No such file or directory) has been
reported, when starting boincmgr.

According to a comment in the bug this is only required for Windows and
therefore I've added a patch in Ubuntu to remove this check.


*** /tmp/tmpvN4UXy
In Ubuntu, we've applied the attached patch to achieve the following:

  * Do not check for /RebootPending.txt, which is only used on
Windows (LP: #297447)

We thought you might be interested in doing the same. 
diff -u boinc-6.2.14/debian/changelog boinc-6.2.14/debian/changelog
diff -u boinc-6.2.14/debian/patches/series boinc-6.2.14/debian/patches/series
--- boinc-6.2.14/debian/patches/series
+++ boinc-6.2.14/debian/patches/series
@@ -5,0 +6 @@
+201_do_not_check_RebootPending
only in patch2:
unchanged:
--- boinc-6.2.14.orig/debian/patches/201_do_not_check_RebootPending
+++ boinc-6.2.14/debian/patches/201_do_not_check_RebootPending
@@ -0,0 +1,31 @@
+Index: boinc-6.2.14/clientgui/BOINCGUIApp.cpp
+===
+--- boinc-6.2.14.orig/clientgui/BOINCGUIApp.cpp	2009-02-08 17:53:25.775184452 +0100
 boinc-6.2.14/clientgui/BOINCGUIApp.cpp	2009-02-08 17:55:13.827186473 +0100
+@@ -325,26 +325,6 @@
+ );
+ 
+ 
+-// Perform any last minute checks that should keep the manager
+-// from starting up.
+-wxString strRebootPendingFile = 
+-GetRootDirectory() + wxFileName::GetPathSeparator() + wxT(RebootPending.txt);
+-
+-wxFileInputStream fisRebootPending(strRebootPendingFile);
+-if (fisRebootPending.IsOk()) {
+-
+-wxMessageDialog dialog(
+-NULL,
+-_(A reboot is required in order for BOINC to run properly.\nPlease reboot your computer and try again.),
+-_(BOINC Manager),
+-wxOK|wxICON_ERROR
+-);
+-
+-dialog.ShowModal();
+-return false;
+-}
+-
+-
+ // Initialize the main document
+ m_pDocument = new CMainDocument();
+ wxASSERT(m_pDocument);