diff options
| -rw-r--r-- | doc/quilt.1.in | 9 | ||||
| -rw-r--r-- | po/de.po | 2 | ||||
| -rw-r--r-- | po/fr.po | 2 | ||||
| -rw-r--r-- | po/ja.po | 2 | ||||
| -rw-r--r-- | po/quilt.pot | 2 | ||||
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/scripts/patchfns.in | 14 |
7 files changed, 25 insertions, 12 deletions
diff --git a/doc/quilt.1.in b/doc/quilt.1.in index 69c2e28..29dd63a 100644 --- a/doc/quilt.1.in +++ b/doc/quilt.1.in @@ -80,8 +80,8 @@ when doing a refresh. (This is limited to patches in unified format; see .B diff documentation). -The series file is looked up in the root of the source tree, in the patches -directory, and in the .pc directory. The first series file that is found is +The series file is looked up in the .pc directory, in the root of the source +tree, and in the patches directory. The first series file that is found is used. This may also be a symbolic link, or a file with multiple hard links. Usually, only one series file is used for a set of patches, so the patches sub-directory is a convenient location. @@ -176,6 +176,11 @@ methods ("-r1", "-r2"). The location of patch files, defaulting to "patches". +.IP QUILT_SERIES 4 + +The name of the series file, defaulting to "series". Unless an absolute path +is used, the search algorithm described above applies. + .IP QUILT_PATCHES_PREFIX 4 If set to anything, quilt will prefix patch names it prints with their @@ -1354,7 +1354,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: quilt/scripts/patchfns.in:1035 +#: quilt/scripts/patchfns.in:1037 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1367,7 +1367,7 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilisée pour les appliquer avant d'installer une version plus ancienne.\\n" -#: quilt/scripts/patchfns.in:1035 +#: quilt/scripts/patchfns.in:1037 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1325,7 +1325,7 @@ msgstr "" "ã¦ã„ã¾ã›ã‚“。ダウングレードã™ã‚‹å‰ã«ã€pushã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® quiltを使ã£ã¦ã€\n" "ã™ã¹ã¦ã®ãƒ‘ッãƒã‚’ pop ã—ã¦ãã ã•ã„。\\n" -#: quilt/scripts/patchfns.in:1035 +#: quilt/scripts/patchfns.in:1037 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 1635bd1..618984a 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -921,7 +921,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:1035 +#: quilt/scripts/patchfns.in:1037 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/quilt.changes b/quilt.changes index 2068d8b..2f617d0 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 5 17:37:43 CEST 2007 - agruen@suse.de + +- Man page improvements from Ben Pfaff <blp@cs.stanford.edu>. +- QUILT_SERIES and series file search algorithm bugfix. + +------------------------------------------------------------------- Sun May 6 14:36:25 CEST 2007 - agruen@suse.de - Mail command: when only a single patch is specified, only mail diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index bb43416..f6407b4 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -1015,17 +1015,19 @@ then unset basedir down fi -if [ -n "$QUILT_SERIES" ] +: ${QUILT_SERIES:=series} + +if [ "${QUILT_SERIES:0:1}" = / ] then SERIES=$QUILT_SERIES -elif [ -e $QUILT_PC/series ] +elif [ -e $QUILT_PC/$QUILT_SERIES ] then - SERIES=$QUILT_PC/series -elif [ -e series ] + SERIES=$QUILT_PC/$QUILT_SERIES +elif [ -e $QUILT_SERIES ] then - SERIES=series + SERIES=$QUILT_SERIES else - SERIES=$QUILT_PATCHES/series + SERIES=$QUILT_PATCHES/$QUILT_SERIES fi DB="$QUILT_PC/applied-patches" |