Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package cowdancer; debdiff attached, but not yet
uploaded.
This is a fix for the single RC bug #852434. Please confirm that this is
OK before I upload to unstable.
unblock cowdancer/0.85
-- System Information:
Debian Release: 9.0
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 'experimental-
debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 4.9.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
diff -Nru cowdancer-0.84/cowbuilder.8 cowdancer-0.85/cowbuilder.8
--- cowdancer-0.84/cowbuilder.8 2017-01-17 22:26:27.000000000 +0000
+++ cowdancer-0.85/cowbuilder.8 2017-01-31 14:53:05.000000000 +0000
@@ -24,28 +24,28 @@
pbuilder manual for details.
.TP
-\fB\-\-create\fR, \fBcreate\fR
+\fBcreate\fR
Create the base.cow image.
The directory for base.cow should be empty, or this command will fail.
.TP
-\fB\-\-update\fR, \fBupdate\fR, \fBup\fR, \fBu\fR
+\fBupdate\fR, \fBup\fR, \fBu\fR
Update the base.cow image.
.TP
-\fB\-\-build\fR, \fBbuild\fR, \fBb\fR
+\fBbuild\fR, \fBb\fR
Build a package given a .dsc file
.TP
-\fB\-\-login\fR, \fBlogin\fR, \fBl\fR
+\fBlogin\fR, \fBl\fR
Start a session within the base.cow.
.TP
-\fB\-\-execute\fR, \fBexecute\fR, \fBe\fR
+\fBexecute\fR, \fBe\fR
Execute a command within the base.cow.
.TP
-\fB\-\-dumpconfig\fR, \fBdumpconfig\fR
+\fBdumpconfig\fR
Dump configuration information, used for debugging.
.SH "OPTIONS"
diff -Nru cowdancer-0.84/debian/changelog cowdancer-0.85/debian/changelog
--- cowdancer-0.84/debian/changelog 2017-01-19 14:41:27.000000000 +0000
+++ cowdancer-0.85/debian/changelog 2017-01-31 17:16:13.000000000 +0000
@@ -1,3 +1,13 @@
+cowdancer (0.85) unstable; urgency=medium
+
+ * cowbuilder.8: Don't document the option-style commands; they're confusing
+ and no longer recommended
+ * parameter.c: Allow commands to come later; deprecation warnings not given,
+ since at least one reverse dependency does not call cowbuilder correctly
+ (Closes: #852434)
+
+ -- James Clarke <jrt...@debian.org> Tue, 31 Jan 2017 17:16:13 +0000
+
cowdancer (0.84) unstable; urgency=medium
[ James Clarke ]
diff -Nru cowdancer-0.84/parameter.c cowdancer-0.85/parameter.c
--- cowdancer-0.84/parameter.c 2017-01-18 18:46:49.000000000 +0000
+++ cowdancer-0.85/parameter.c 2017-01-31 17:14:34.000000000 +0000
@@ -401,6 +401,14 @@
{"debootstrapopts", required_argument, 0, 0},
{"debootstrap", required_argument, 0, 0},
+ /* Deprecated command placement; should be given first */
+ {"build", no_argument, 0, 0},
+ {"create", no_argument, 0, 0},
+ {"update", no_argument, 0, 0},
+ {"login", no_argument, 0, 0},
+ {"execute", no_argument, 0, 0},
+ {"dumpconfig", no_argument, 0, 0},
+
/* cowbuilder specific options */
{"no-cowdancer-update", no_argument, 0, 0},
{"debian-etch-workaround", no_argument, 0, 0},
@@ -480,19 +488,13 @@
}
}
- if (pc.operation == pbuilder_do_nothing) {
- log_printf(log_error, "Unknown operation: %s", av[1]);
- return 1;
+ if (pc.operation != pbuilder_do_nothing) {
+ --ac;
+ av[1] = av[0];
+ ++av;
}
- } else {
- log_printf(log_error, "No operation specified");
- return 1;
}
- --ac;
- av[1] = av[0];
- ++av;
-
#define PASS_TO_PBUILDER_WITH_PARAM \
PBUILDER_ADD_PARAM(cmdstr); \
PBUILDER_ADD_PARAM(strdup(optarg));
@@ -573,6 +575,27 @@
* behavior, so ignore it, for most of the time.
*/
+ /* Handle deprecated command placement */
+ if (!strcmp(long_options[index_point].name,
"build")) {
+ pc.operation = pbuilder_build;
+ break;
+ } else if
(!strcmp(long_options[index_point].name, "create")) {
+ pc.operation = pbuilder_create;
+ break;
+ } else if
(!strcmp(long_options[index_point].name, "update")) {
+ pc.operation = pbuilder_update;
+ break;
+ } else if
(!strcmp(long_options[index_point].name, "login")) {
+ pc.operation = pbuilder_login;
+ break;
+ } else if
(!strcmp(long_options[index_point].name, "execute")) {
+ pc.operation = pbuilder_execute;
+ break;
+ } else if
(!strcmp(long_options[index_point].name, "dumpconfig")) {
+ pc.operation = pbuilder_dumpconfig;
+ break;
+ }
+
/* handle specific options which also give 0. */
/* first, generate 'cmdstr' which is useful
anyway */
@@ -835,6 +858,10 @@
case pbuilder_dumpconfig:
return cpbuilder_dumpconfig(&pc);
+ case pbuilder_do_nothing:
+ log_printf(log_error, "No operation specified");
+ return 1;
+
default:
log_printf(log_error,
"Internal error: Unknown operation
(%d)",
