projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 3.3.1
[debian/amanda]
/
server-src
/
planner.c
diff --git
a/server-src/planner.c
b/server-src/planner.c
index eceb2bc9bd04a06c6c14677fae06985e65c7b0ad..c8501e2f35aced2ab93db61374600e0fd921c0ef 100644
(file)
--- a/
server-src/planner.c
+++ b/
server-src/planner.c
@@
-193,6
+193,11
@@
main(
gboolean no_taper = FALSE;
gboolean from_client = FALSE;
gboolean no_taper = FALSE;
gboolean from_client = FALSE;
+ if (argc > 1 && argv && argv[1] && g_str_equal(argv[1], "--version")) {
+ printf("planner-%s\n", VERSION);
+ return (0);
+ }
+
/*
* Configure program for internationalization:
* 1) Only set the message locale for now.
/*
* Configure program for internationalization:
* 1) Only set the message locale for now.
@@
-1021,6
+1026,10
@@
setup_estimate(
case DS_STANDARD:
case DS_NOINC:
askfor(ep, i++, 0, &info);
case DS_STANDARD:
case DS_NOINC:
askfor(ep, i++, 0, &info);
+ if (ep->last_level == -1)
+ ep->degr_mesg = _("Skipping: new disk can't be dumped in degraded mode");
+ else
+ ep->degr_mesg = _("Skipping: strategy NOINC can't be dumped in degraded mode");
if(dp->skip_full) {
log_add(L_INFO, _("Ignoring skip-full for %s:%s "
"because the strategy is NOINC."),
if(dp->skip_full) {
log_add(L_INFO, _("Ignoring skip-full for %s:%s "
"because the strategy is NOINC."),
@@
-1975,7
+1984,8
@@
static void handle_result(
break;
}
}
break;
}
}
- if (i == MAX_LEVELS) {
+ if (i == MAX_LEVELS && level > 0) {
+ /* client always report level 0 for some error */
goto bad_msg; /* this est wasn't requested */
}
est(dp)->got_estimate++;
goto bad_msg; /* this est wasn't requested */
}
est(dp)->got_estimate++;
@@
-2979,7
+2989,8
@@
static int promote_hills(void)
}
for(dp = schedq.head; dp != NULL; dp = dp->next) {
}
for(dp = schedq.head; dp != NULL; dp = dp->next) {
- days = est(dp)->next_level0; /* This is > 0 by definition */
+ days = est(dp)->next_level0;
+ if (days < 0) days = 0;
if(days<my_dumpcycle && !dp->skip_full && dp->strategy != DS_NOFULL &&
dp->strategy != DS_INCRONLY) {
sp[days].disks++;
if(days<my_dumpcycle && !dp->skip_full && dp->strategy != DS_NOFULL &&
dp->strategy != DS_INCRONLY) {
sp[days].disks++;