[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-329-g489f040

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit 7acf16b1289906f5720afee71efd99a32cffe3b3
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jun 13 21:25:36 2011 +0200

    Added a bit for the project creation

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 41e87a5..877e230 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -264,43 +264,6 @@
  
  
  class Project:
-@@ -423,7 +390,7 @@
-         config.upload_dir    = os.path.join(self.project_dir , 'upload')
-         config.key_dir       = key_dir or os.path.join(self.project_dir , 'keys')
-         config.app_dir       = os.path.join(self.project_dir, 'apps')
--        config.log_dir       = self.project_dir+'log_'+config.host
-+        config.log_dir       = os.path.join(self.project_dir, 'log_' + config.host)
-         if production:
-             config.min_sendwork_interval = 6
-         self.scheduler_url = os.path.join(config.cgi_url     , 'cgi')
-@@ -434,21 +401,20 @@
-     def keydir(self, *dirs):
-         return apply(os.path.join,(self.config.config.key_dir,)+dirs)
- 
--    def logdir(self):
--        return os.path.join(self.project_dir, "log_"+self.config.config.host)
--
-     def create_keys(self):
-         if not os.path.exists(self.keydir()):
--            os.mkdir(self.keydir())
-+            os.mkdir(self.keydir(), 0750)
-         _gen_key(self.keydir('upload'))
-         _gen_key(self.keydir('code_sign'))
- 
-     def create_logdir(self):
--        os.mkdir(self.logdir())
--        os.chmod(self.logdir(), 02770)
-+        os.mkdir(self.config.config.log_dir)
-+        os.chmod(self.config.config.log_dir, 02770)
- 
-     def query_create_keys(self):
--        return query_yesno("Keys don't exist in %s; generate them?"%self.keydir())
-+        if not options.no_query:
-+            return query_yesno("Keys don't exist in %s; generate them?"%self.keydir())
-+        return True
- 
-     def keys_exist(self):
-         keys = ['upload_private', 'upload_public',
 @@ -457,6 +423,16 @@
              if not os.path.exists(self.keydir(key)): return False
          return True
diff --git a/debian/patches/series b/debian/patches/series
index 8fa0307..f7474ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 local_sztaki_workOnTransitioner.patch
 local_sztaki_backendlib.patch
 upstream_sztaki_simplerInvocationCmdLine.patch
+upstream_sztaki_configLogDirSpec.patch
 debian_sztaki_httpdUserIsWwwData.patch
 upstream_sztaki_improveSchedStart.patch
 local_sztaki_toolsUpgradeSimplification.patch
diff --git a/debian/patches/upstream_sztaki_configLogDirSpec.patch b/debian/patches/upstream_sztaki_configLogDirSpec.patch
new file mode 100644
index 0000000..53453af
--- /dev/null
+++ b/debian/patches/upstream_sztaki_configLogDirSpec.patch
@@ -0,0 +1,41 @@
+Index: boinc/py/Boinc/setup_project.py
+===================================================================
+--- boinc.orig/py/Boinc/setup_project.py	2011-06-13 21:20:40.000000000 +0200
++++ boinc/py/Boinc/setup_project.py	2011-06-13 21:24:07.000000000 +0200
+@@ -430,7 +430,7 @@
+         config.upload_dir    = os.path.join(self.project_dir , 'upload')
+         config.key_dir       = key_dir or os.path.join(self.project_dir , 'keys')
+         config.app_dir       = os.path.join(self.project_dir, 'apps')
+-        config.log_dir       = self.project_dir+'log_'+config.host
++        config.log_dir       = os.path.join(self.project_dir,'log_'+config.host)
+         if production:
+             config.min_sendwork_interval = 6
+         self.scheduler_url = os.path.join(config.cgi_url     , 'cgi')
+@@ -441,21 +441,20 @@
+     def keydir(self, *dirs):
+         return apply(os.path.join,(self.config.config.key_dir,)+dirs)
+ 
+-    def logdir(self):
+-        return os.path.join(self.project_dir, "log_"+self.config.config.host)
+-
+     def create_keys(self):
+         if not os.path.exists(self.keydir()):
+-            os.mkdir(self.keydir())
++            os.mkdir(self.keydir(), 0750)
+         _gen_key(self.keydir('upload'))
+         _gen_key(self.keydir('code_sign'))
+ 
+     def create_logdir(self):
+-        os.mkdir(self.logdir())
+-        os.chmod(self.logdir(), 02770)
++        os.mkdir(self.config.config.log_dir)
++        os.chmod(self.config.config.log_dir, 02770)
+ 
+     def query_create_keys(self):
+-        return query_yesno("Keys don't exist in %s; generate them?"%self.keydir())
++        if not options.no_query:
++            return query_yesno("Keys don't exist in %s; generate them?"%self.keydir())
++        return True
+ 
+     def keys_exist(self):
+         keys = ['upload_private', 'upload_public',

-- 
BOINC packaging