[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-48-g8ac6917
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Mon Sep 17 15:46:23 UTC 2012
The following commit has been merged in the master branch:
commit 8ac6917bd914376c947d4867ca2b6d8987274890
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Mon Sep 17 17:46:06 2012 +0200
New patch version, better error detecting
modified: debian/patches/opendir_error_messages.patch
diff --git a/debian/patches/opendir_error_messages.patch b/debian/patches/opendir_error_messages.patch
index 11d385d..4843c5d 100644
--- a/debian/patches/opendir_error_messages.patch
+++ b/debian/patches/opendir_error_messages.patch
@@ -78,7 +78,7 @@ Index: boinc/lib/filesys.cpp
@@ -367,8 +367,12 @@
int retval;
DIRREF dirp;
-
+
+ if (!boinc_file_or_symlink_exists(dirpath)) return 0; // if dir doesn't exist, it's empty
dirp = dir_open(dirpath);
- if (!dirp) return 0; // if dir doesn't exist, it's empty
@@ -98,12 +98,14 @@ Index: boinc/lib/filesys.cpp
int retval=0;
DIRREF dirp;
double x;
-@@ -579,8 +583,8 @@
+@@ -578,9 +582,9 @@
+ fclose(src);
fclose(dst);
// Copy file's ownership, permissions to the extent we are allowed
- lstat(orig, &sbuf); // Get source file's info
+- lstat(orig, &sbuf); // Get source file's info
- chown(newf, sbuf.st_uid, sbuf.st_gid);
- chmod(newf, sbuf.st_mode);
++ if (lstat(orig, &sbuf)) retval=ERR_FWRITE; // Get source file's info
+ if (chown(newf, sbuf.st_uid, sbuf.st_gid)) retval=ERR_FWRITE;
+ if (chmod(newf, sbuf.st_mode)) retval=ERR_FWRITE;
return retval;
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list