- quilt/setup.in: Add --path option for defining a tarball search

  path. Fix a bug in check_for_existing_files. When a series file
  is given as an argument, symlink to that series file in the
  same way as we symlink to the patches. Improve the symlink
  creation algorithm. Add testcase test/setup.test.

4 files changed, 108 insertions, 66 deletions

diff --git a/po/de.po b/po/de.po
index f60b995..6f98f9e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1378,47 +1378,59 @@ msgstr ""
 "\n"
 "-v\tAusführlichere, benutzerfreundliche Ausgabe.\n"
 
-#: quilt/setup.in:27
-msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}\\n"
+#: quilt/setup.in:31
+msgid "Directory %s exists\\n"
+msgstr "Verzeichnis %s existiert\\n"
+
+#: quilt/setup.in:37
+msgid "File %s exists\\n"
+msgstr "Datei %s existiert\\n"
+
+#: quilt/setup.in:93
+msgid ""
+"Usage: quilt setup [-d path-prefix] [-v] [--path dir1:dir2] {specfile|"
+"seriesfile}\\n"
 msgstr ""
-"Verwendung: quilt setup [-d pfad-präfix] [-v] {spec-datei|series-datei}\\n"
+"Verwendung: quilt setup [-d pfad-präfix] [-v] [--path pfad:pfad] {spec-datei|"
+"series-datei}\\n"
 
-#: quilt/setup.in:30
+#: quilt/setup.in:96
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
 "\n"
-"-d\toptional path prefix (sub-directory).\n"
+"-d\tOptional path prefix.\n"
+"\n"
+"--path\tDirectories to search when looking for tarballs. Defaults to \\`.'.\n"
 "\n"
-"-v\tverbose debug output.\n"
+"-v\tVerbose debug output.\n"
 msgstr ""
 "\n"
 "Initialisiere einen Quellbaum aus einer rpm spec-Datei oder einer quilt "
 "series-Datei.\n"
 "\n"
-"-d\tOptionaler Pfad-Präfix (Unterverzeichnis).\n"
+"-d\tOptionaler Pfad-Präfix.\n"
+"\n"
+"--path\tVerzeichnisse, in denen nach tar-Archiven gesucht wird. Wenn nicht\n"
+"\tanders angegeben, wird \\`.' durchsucht.\n"
 "\n"
 "-v\tAusführliche Ausgabe.\n"
 
-#: quilt/setup.in:96
-msgid "Directory %s exists\\n"
-msgstr "Verzeichnis %s existiert\\n"
-
-#: quilt/setup.in:102
-msgid "File %s exists\\n"
-msgstr "Datei %s existiert\\n"
-
-#: quilt/setup.in:118
+#: quilt/setup.in:158
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "Der %%prep-Abschnitt von %s ist fehlgeschlagen; die Ergebnisse sind "
 "möglicherweise unvollständig\\n"
 
-#: quilt/setup.in:121
+#: quilt/setup.in:161
 msgid "The -v option will show rpm's output\\n"
 msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n"
 
-#: quilt/setup.in:155
+#: quilt/setup.in:198
+msgid "File %s not found in search path\\n"
+msgstr "Datei %s nicht im Suchpfad gefunden\\n"
+
+#: quilt/setup.in:201
 msgid "Unpacking archive %s\\n"
 msgstr "Entpacke Archiv %s\\n"
 
diff --git a/po/fr.po b/po/fr.po
index e6345eb..8485204 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1383,20 +1383,34 @@ msgstr ""
 "\n"
 "-v\tAffichage verbeux, plus simple � lire.\n"
 
-#: quilt/setup.in:27
-msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}\\n"
+#: quilt/setup.in:31
+msgid "Directory %s exists\\n"
+msgstr "Le r�pertoire %s existe\\n"
+
+#: quilt/setup.in:37
+msgid "File %s exists\\n"
+msgstr "Le fichier %s existe\\n"
+
+#: quilt/setup.in:93
+#, fuzzy
+msgid ""
+"Usage: quilt setup [-d path-prefix] [-v] [--path dir1:dir2] {specfile|"
+"seriesfile}\\n"
 msgstr ""
 "Usage : quilt setup [-d r�pertoire_source] [-v] {fichier_s�ries|fichier_spec}"
 "\\n"
 
-#: quilt/setup.in:30
+#: quilt/setup.in:96
+#, fuzzy
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
 "\n"
-"-d\toptional path prefix (sub-directory).\n"
+"-d\tOptional path prefix.\n"
+"\n"
+"--path\tDirectories to search when looking for tarballs. Defaults to \\`.'.\n"
 "\n"
-"-v\tverbose debug output.\n"
+"-v\tVerbose debug output.\n"
 msgstr ""
 "\n"
 "Initialise un arbre de sources � partir d'un fichier de\n"
@@ -1406,24 +1420,21 @@ msgstr ""
 "\n"
 "-v\taffichage verbeux pour le debug.\n"
 
-#: quilt/setup.in:96
-msgid "Directory %s exists\\n"
-msgstr "Le r�pertoire %s existe\\n"
-
-#: quilt/setup.in:102
-msgid "File %s exists\\n"
-msgstr "Le fichier %s existe\\n"
-
-#: quilt/setup.in:118
+#: quilt/setup.in:158
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "La section %%prep de %s a �chou� ; les r�sultats sont peut-�tre incomplets\\n"
 
-#: quilt/setup.in:121
+#: quilt/setup.in:161
 msgid "The -v option will show rpm's output\\n"
 msgstr "L'option -v montre les affichages de rpm\\\\n"
 
-#: quilt/setup.in:155
+#: quilt/setup.in:198
+#, fuzzy
+msgid "File %s not found in search path\\n"
+msgstr "Le fichier %s n'est pas dans le patch %s.\\n"
+
+#: quilt/setup.in:201
 msgid "Unpacking archive %s\\n"
 msgstr "D�sarchivage de %s\\n"
 
diff --git a/po/ja.po b/po/ja.po
index b7db633..c405fd4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1340,19 +1340,33 @@ msgstr ""
 "-v\t詳細で見やすい表示。\n"
 "\n"
 
-#: quilt/setup.in:27
-msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}\\n"
+#: quilt/setup.in:31
+msgid "Directory %s exists\\n"
+msgstr "ディレクトリ %s は、すでに存在します\\n"
+
+#: quilt/setup.in:37
+msgid "File %s exists\\n"
+msgstr "ファイル %s は、すでに存在します\\n"
+
+#: quilt/setup.in:93
+#, fuzzy
+msgid ""
+"Usage: quilt setup [-d path-prefix] [-v] [--path dir1:dir2] {specfile|"
+"seriesfile}\\n"
 msgstr ""
 "使い方: quilt setup [-d path-prefix] [-v] {specファイル|seriesファイル}\\n"
 
-#: quilt/setup.in:30
+#: quilt/setup.in:96
+#, fuzzy
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
 "\n"
-"-d\toptional path prefix (sub-directory).\n"
+"-d\tOptional path prefix.\n"
+"\n"
+"--path\tDirectories to search when looking for tarballs. Defaults to \\`.'.\n"
 "\n"
-"-v\tverbose debug output.\n"
+"-v\tVerbose debug output.\n"
 msgstr ""
 "\n"
 "rpmの specファイルまたは quiltの seriesファイルを使ってソースツリーを\n"
@@ -1362,25 +1376,22 @@ msgstr ""
 "\n"
 "-v\t詳細なデバッグ表示\n"
 
-#: quilt/setup.in:96
-msgid "Directory %s exists\\n"
-msgstr "ディレクトリ %s は、すでに存在します\\n"
-
-#: quilt/setup.in:102
-msgid "File %s exists\\n"
-msgstr "ファイル %s は、すでに存在します\\n"
-
-#: quilt/setup.in:118
+#: quilt/setup.in:158
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "%%prepセクションの解析に失敗しました。完全に作業が完了していない場合がありま"
 "す\\n"
 
-#: quilt/setup.in:121
+#: quilt/setup.in:161
 msgid "The -v option will show rpm's output\\n"
 msgstr "-vオプションを使って、rpmの出力を表示できます"
 
-#: quilt/setup.in:155
+#: quilt/setup.in:198
+#, fuzzy
+msgid "File %s not found in search path\\n"
+msgstr "ファイル %s は、パッチ %s に含まれていません\\n"
+
+#: quilt/setup.in:201
 msgid "Unpacking archive %s\\n"
 msgstr "アーカイブ %s を展開しています\\n"
 
diff --git a/po/quilt.pot b/po/quilt.pot
index 827a130..f8b8d3d 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -965,37 +965,45 @@ msgid ""
 "-v\tVerbose, more user friendly output.\n"
 msgstr ""
 
-#: quilt/setup.in:27
-msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}\\n"
+#: quilt/setup.in:31
+msgid "Directory %s exists\\n"
 msgstr ""
 
-#: quilt/setup.in:30
+#: quilt/setup.in:37
+msgid "File %s exists\\n"
+msgstr ""
+
+#: quilt/setup.in:93
+msgid ""
+"Usage: quilt setup [-d path-prefix] [-v] [--path dir1:dir2] {specfile|"
+"seriesfile}\\n"
+msgstr ""
+
+#: quilt/setup.in:96
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
 "\n"
-"-d\toptional path prefix (sub-directory).\n"
+"-d\tOptional path prefix.\n"
 "\n"
-"-v\tverbose debug output.\n"
-msgstr ""
-
-#: quilt/setup.in:96
-msgid "Directory %s exists\\n"
-msgstr ""
-
-#: quilt/setup.in:102
-msgid "File %s exists\\n"
+"--path\tDirectories to search when looking for tarballs. Defaults to \\`.'.\n"
+"\n"
+"-v\tVerbose debug output.\n"
 msgstr ""
 
-#: quilt/setup.in:118
+#: quilt/setup.in:158
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 
-#: quilt/setup.in:121
+#: quilt/setup.in:161
 msgid "The -v option will show rpm's output\\n"
 msgstr ""
 
-#: quilt/setup.in:155
+#: quilt/setup.in:198
+msgid "File %s not found in search path\\n"
+msgstr ""
+
+#: quilt/setup.in:201
 msgid "Unpacking archive %s\\n"
 msgstr ""