summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2004-09-21 13:36:18 +0000
committerAndreas Gruenbacher <agruen@suse.de>2004-09-21 13:36:18 +0000
commit117e66f40d01d34d4be2336029f4a55b5d51d762 (patch)
treea8146580c2c384bfdf2c7f3c510a1af82cf22dad
parent0cabf722ff1fdee14c89cb9ceaffcd5134670bba (diff)
downloadquilt-117e66f40d01d34d4be2336029f4a55b5d51d762.tar.gz
- Series command: add missing paths to patches if
$QUILT_PATCHES_PREFIX is set. - test/run script: Add export and unset statements.
-rw-r--r--quilt.changes7
-rw-r--r--quilt/series.in4
-rwxr-xr-xtest/run7
3 files changed, 16 insertions, 2 deletions
diff --git a/quilt.changes b/quilt.changes
index 2c7757e..1c75cb6 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Sep 21 15:39:09 CEST 2004 - agruen@suse.de
+
+- Series command: add missing paths to patches if
+ $QUILT_PATCHES_PREFIX is set.
+- test/run script: Add export and unset statements.
+
+-------------------------------------------------------------------
Tue Sep 14 01:00:43 CEST 2004 - agruen@suse.de
- bin/quilt.in: Add optional verbose modifier to --trace option
diff --git a/quilt/series.in b/quilt/series.in
index cdbd3ee..d7911b7 100644
--- a/quilt/series.in
+++ b/quilt/series.in
@@ -41,7 +41,7 @@ cat_patches()
for patch in "$@"
do
- echo "$prefix$(print_patch $patch)"
+ echo "$prefix$(print_patch "$patch")"
done
}
@@ -82,7 +82,7 @@ then
[ -n "$top" ] && cat_patches "= " $top
cat_patches " " $(patches_after $top)
else
- cat_series
+ cat_patches "" $(cat_series)
fi
### Local Variables:
### mode: shell-script
diff --git a/test/run b/test/run
index 026263a..8d196a1 100755
--- a/test/run
+++ b/test/run
@@ -198,6 +198,13 @@ sub exec_test($$) {
return su($prog->[1]);
} elsif ($prog->[0] eq "sg") {
return sg($prog->[1]);
+ } elsif ($prog->[0] eq "export") {
+ my ($name, $value) = split /=/, prog->[1];
+ $ENV{$name} = $value;
+ return [];
+ } elsif ($prog->[0] eq "unset") {
+ delete $ENV{$name};
+ return [];
}
pipe *IN2, *OUT