chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix up --same --upload thing to only apply to --same
[ypp-sc-tools.db-live.git]
/
pctb
/
convert.c
diff --git
a/pctb/convert.c
b/pctb/convert.c
index 950300b588d1cc7e1e7fe9afc5409f0c4084c8d2..f3b87fea193de43d825417e706ec0ecad1175404 100644
(file)
--- a/
pctb/convert.c
+++ b/
pctb/convert.c
@@
-82,9
+82,6
@@
static void open_screenshot_file(const char *mode) {
if (!screenshot_file)
fatal("could not open screenshots file `%s': %s",
o_screenshot_fn, strerror(errno));
if (!screenshot_file)
fatal("could not open screenshots file `%s': %s",
o_screenshot_fn, strerror(errno));
-
- if ((o_flags & ff_upload) && !(o_flags & ff_testservers))
- badusage("must not reuse screenshots for upload to live PCTB database");
}
static void run_analysis(void) {
}
static void run_analysis(void) {
@@
-300,6
+297,8
@@
int main(int argc, char **argv) {
progress_log("OK for you to move the mouse now.");
}
if (o_mode & mf_readscreenshot) {
progress_log("OK for you to move the mouse now.");
}
if (o_mode & mf_readscreenshot) {
+ if ((o_flags & ff_upload) && !(o_flags & ff_testservers))
+ badusage("must not reuse screenshots for upload to live PCTB database");
open_screenshot_file("r");
if (o_flags & ff_singlepage) read_one_screenshot();
else read_screenshots();
open_screenshot_file("r");
if (o_flags & ff_singlepage) read_one_screenshot();
else read_screenshots();