Package: svn-buildpackage Version: 0.6.14 Severity: normal Tags: patch The source says:
# no summary when using custom command
if(! $opt_buildcmd) {
Sure, the code block in the if displays a summary, but it also moves
files according to --svn-move and --svn-move-to. Thus, if using
a custom builder, the files are not moved.
I suggest getting rid of the if. Any build command I know puts the
result into .., so build-area, so it should be trivial to just move.
If the build command does something fancy, well, don't use --svn-move
then.
diff -u /tmp/svn-buildpackage =svn-buildpackage
--- /tmp/svn-buildpackage 2006-08-03 23:22:11.864199140 +0100
+++ /usr/bin/svn-buildpackage 2006-08-03 23:24:24.422156302 +0100
@@ -480,45 +480,41 @@
system "$opt_postbuild" if($opt_postbuild);
- # no summary when using custom command
- if(! $opt_buildcmd) {
+ chdir "..";
+ for $arch (`dpkg --print-architecture`, "source") {
+ chomp($arch);
+ $chfile="$package"."_$tagVersionNonEpoch"."_$arch.changes";
+ last if(open($ch, "<$ba/$chfile"));
+ }
- chdir "..";
- for $arch (`dpkg --print-architecture`, "source") {
- chomp($arch);
- $chfile="$package"."_$tagVersionNonEpoch"."_$arch.changes";
- last if(open($ch, "<$ba/$chfile"));
- }
+ if(open($ch, "<$ba/$chfile")) {
+ while(<$ch>) { push(@newfiles, $1)
if(/^\s\w+\s\d+\s\S+\s\w+\s(.+)\n/); }
+ close($ch);
+ push(@newfiles, "$ba/$chfile");
- if(open($ch, "<$ba/$chfile")) {
- while(<$ch>) { push(@newfiles, $1)
if(/^\s\w+\s\d+\s\S+\s\w+\s(.+)\n/); }
- close($ch);
- push(@newfiles, "$ba/$chfile");
-
- if($opt_move) {
- $retval=!withechoNoPrompt("mv", @newfiles, $destdir);
- }
- else { $destdir=$ba; }
-
- # expand the paths in the list and kick non-binary packages
-
- map { if(/\.deb$/){ $_=" $destdir/$_"; $multi++}else{undef $_}}
@newfiles;
-
- print STDERR `tput smso`,
- "build command was successful; binaries are in $destdir/. ",
- "The changes file is:\n $destdir/$chfile\n",
- `tput rmso`, "Binary package",
- ($multi > 1 ? "s:\n" : ":\n"),
- @newfiles, "\n";
-
- print STDERR `tput smso`,
- "Warning: $package should have an orig tarball but it does
not!\n",
- `tput rmso` if(($upVersion ne $tagVersion) && ($tagVersion
=~/-1$/) && !-e "$destdir/$orig");
- }
- elsif($opt_verbose)
- {
- print STDERR "Could not read the .changes file";
+ if($opt_move) {
+ $retval=!withechoNoPrompt("mv", @newfiles, $destdir);
}
+ else { $destdir=$ba; }
+
+ # expand the paths in the list and kick non-binary packages
+
+ map { if(/\.deb$/){ $_=" $destdir/$_"; $multi++}else{undef $_}}
@newfiles;
+
+ print STDERR `tput smso`,
+ "build command was successful; binaries are in $destdir/. ",
+ "The changes file is:\n $destdir/$chfile\n",
+ `tput rmso`, "Binary package",
+ ($multi > 1 ? "s:\n" : ":\n"),
+ @newfiles, "\n";
+
+ print STDERR `tput smso`,
+ "Warning: $package should have an orig tarball but it does not!\n",
+ `tput rmso` if(($upVersion ne $tagVersion) && ($tagVersion =~/-1$/) &&
!-e "$destdir/$orig");
+ }
+ elsif($opt_verbose)
+ {
+ print STDERR "Could not read the .changes file";
}
# cleanup
--
Please do not send copies of list mail to me; I read the list!
.''`. martin f. krafft <[EMAIL PROTECTED]>
: :' : proud Debian developer and author: http://debiansystem.info
`. `'`
`- Debian - when you have better things to do than fixing a system
signature.asc
Description: Digital signature (GPG/PGP)
