projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prepare to upload
[debian/amanda]
/
server-src
/
server_util.c
diff --git
a/server-src/server_util.c
b/server-src/server_util.c
index 515eea59a84d261e1b37ee180f00eb09d4e6a623..24a91ff9625ac2af1a2ea47b9ecdf3422a4eaa23 100644
(file)
--- a/
server-src/server_util.c
+++ b/
server-src/server_util.c
@@
-514,8
+514,10
@@
internal_server_estimate(
size = (gint64)10000;
if (size > tapetype_get_length(tape)/2)
size = tapetype_get_length(tape)/2;
size = (gint64)10000;
if (size > tapetype_get_length(tape)/2)
size = tapetype_get_length(tape)/2;
- if (size > level0_size/2)
- size = level0_size/2;
+ if (level0_size > 0 && dp->strategy != DS_NOFULL) {
+ if (size > level0_size/2)
+ size = level0_size/2;
+ }
*stats = 0;
}
}
*stats = 0;
}
}
@@
-548,10
+550,18
@@
internal_server_estimate(
size = (gint64)100000;
if (size > tapetype_get_length(tape)/2)
size = tapetype_get_length(tape)/2;
size = (gint64)100000;
if (size > tapetype_get_length(tape)/2)
size = tapetype_get_length(tape)/2;
- if (size > level0_size/2)
- size = level0_size/2;
+ if (level0_size > 0 && dp->strategy != DS_NOFULL) {
+ if (size > level0_size/2)
+ size = level0_size/2;
+ }
*stats = 0;
}
*stats = 0;
}
+ } else {
+ char *conf_tapetype = getconf_str(CNF_TAPETYPE);
+ tapetype_t *tape = lookup_tapetype(conf_tapetype);
+ size = (gint64)100000;
+ if (size > tapetype_get_length(tape)/2)
+ size = tapetype_get_length(tape)/2;
}
return size;
}
return size;