On Fri, Mar 16, 2007, Loïc Minier wrote:
> Attached.
Sorry, there you go.
--
Loïc Minier
diff -urN svn-buildpackage-0.6.16/SDCommon.pm svn-buildpackage-0.6.17/SDCommon.pm
--- svn-buildpackage-0.6.16/SDCommon.pm 2006-12-26 16:00:40.000000000 +0100
+++ svn-buildpackage-0.6.17/SDCommon.pm 2007-03-16 21:33:46.000000000 +0100
@@ -14,6 +14,8 @@
my $opt_verbose;
my $opt_noninteractive;
+my $nosave = 1;
+
my $version;
# to be replaced during the package creation
$version=0.5;
@@ -304,34 +306,9 @@
}
-sub configure {
-
- &init if(!$tagVersion);
- # keep the list of known vars here
- # @cfgVars=("upsCurrentDir", "upsTagDir", "tagsDir", "origDir", "origUrl",
- # "upsCurrentUrl","upsTagUrl", "tagsUrl", "trunkUrl", "trunkDir");
+sub readCfg {
+ my $fromFile = shift;
- my $fromFile=$cfgFile;
- if(!-e $cfgFile) {
- if(-e $defCfgFile) {
- print "$cfgFile not found, importing defaults from $defCfgFile\n";
- $fromFile=$defCfgFile;
- }
- else {
- print "$cfgFile not found, importing settings via Subversion properties... \n";
- foreach ( $prop, `svn proplist debian | grep 'svn-bp:'` ) {
- # import every svn-bp:* property as a cfg
- if(/\s*svn-bp:(\S+)\s*/) {
- $val=`svn propget svn-bp:$1 debian | head -n1 | tr -d '\n'`;
- $val=~ s/\ ~/\ $ENV{"HOME"}/;
- $c{$1}=$val;
- print "\t$1: $val\n";
- }
- }
- print "Autodetecting remaining properties... \n";
- }
- }
-
if(-r $fromFile) {
open($cfg, "<$fromFile");
while(<$cfg>) {
@@ -347,6 +324,31 @@
}
close($cfg);
}
+}
+
+sub configure {
+
+ &init if(!$tagVersion);
+ # keep the list of known vars here
+ # @cfgVars=("upsCurrentDir", "upsTagDir", "tagsDir", "origDir", "origUrl",
+ # "upsCurrentUrl","upsTagUrl", "tagsUrl", "trunkUrl", "trunkDir");
+
+ # global configuration (~/.svn-buildpackage.conf)
+ readCfg($defCfgFile) if -e $defCfgFile;
+
+ # per repository configuration ("svn-bp:" SVN properties)
+ foreach ( $prop, `svn proplist debian | grep 'svn-bp:'` ) {
+ # import every svn-bp:* property as a cfg
+ if(/\s*svn-bp:(\S+)\s*/) {
+ $val=`svn propget svn-bp:$1 debian | head -n1 | tr -d '\n'`;
+ $val=~ s/\ ~/\ $ENV{"HOME"}/;
+ $c{$1}=$val;
+ print "\t$1: $val\n";
+ }
+ }
+
+ # per working copy override file (.svn/deb-layout)
+ readCfg($cfgFile) if -e $cfgFile;
# always redetect them; keep them in the same config base just for the
# record
@@ -379,7 +381,7 @@
$c{"origUrl"}=url($c{"origDir"}) if($c{"origDir"} && !defined $c{"origUrl"});
}
- &writeCfg;
+ &writeCfg if(!$nosave);
#
#foreach("branches", "tarballs", "trunk", "tags") {
# if(length($pkgDir)) {
diff -urN svn-buildpackage-0.6.16/debian/changelog svn-buildpackage-0.6.17/debian/changelog
--- svn-buildpackage-0.6.16/debian/changelog 2006-12-26 16:08:23.000000000 +0100
+++ svn-buildpackage-0.6.17/debian/changelog 2007-03-16 21:33:15.000000000 +0100
@@ -1,3 +1,14 @@
+svn-buildpackage (0.6.17) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add missing declaration for $nosave in SDCommon.
+ * Do not write .svn/deb-layout if nosave is set; this is the default.
+ * Move $SDCommon::nosave default out of a loop.
+ * Always read all configuration sources in the following order:
+ ~/.svn-buildpackage.conf, "svn-bp:" SVN properties, .svn/deb-layout.
+
+ -- Loic Minier <[EMAIL PROTECTED]> Fri, 16 Mar 2007 21:12:42 +0100
+
svn-buildpackage (0.6.16) unstable; urgency=medium
[ Eddy Petrișor ]
diff -urN svn-buildpackage-0.6.16/svn-buildpackage svn-buildpackage-0.6.17/svn-buildpackage
--- svn-buildpackage-0.6.16/svn-buildpackage 2006-12-26 16:05:43.000000000 +0100
+++ svn-buildpackage-0.6.17/svn-buildpackage 2007-03-16 21:25:43.000000000 +0100
@@ -208,9 +208,9 @@
die "Aborting now, set \$FORCETAG to ignore it.\n" if($opt_tag && !$ENV{"FORCETAG"});
}
+$SDCommon::nosave=1;
@opt_override = split(/,|\ |\r|\n/,join(',',@opt_override));
for(@opt_override) {
- $SDCommon::nosave=1;
if(/(.*)=(.*)/) {
print "Overriding variable: $1 with $2\n" if $opt_verbose;
$$c{$1}=$2;
