[Pkg-bazaar-commits] ./bzr-builddeb/trunk.old r253: Squash remaining references to ../tarballs.
James Westby
jw+debian at jameswestby.net
Wed Dec 10 08:32:58 UTC 2008
------------------------------------------------------------
revno: 253
committer: James Westby <jw+debian at jameswestby.net>
branch nick: 2.0
timestamp: Wed 2008-08-27 13:54:12 +0100
message:
Squash remaining references to ../tarballs.
modified:
README
__init__.py
doc/user_manual/configuration.rst
doc/user_manual/merge.rst
doc/user_manual/normal.rst
import_dsc.py
-------------- next part --------------
=== modified file 'README'
--- a/README 2007-10-23 21:06:37 +0000
+++ b/README 2008-08-27 12:54:12 +0000
@@ -93,13 +93,12 @@
* ``result-dir = path``
- The directory the resulting files will be placed in. (Defaults to whatever
- is being used for ``build_dir``).
+ The directory the resulting files will be placed in. (Defaults to ``..``)
* ``orig-dir = path``
The directory to search for the ``.orig.tar.gz`` when not in native mode.
- (Defaults to ``../tarballs`` relative to the branch).
+ (Defaults to ``..`` relative to the branch).
Modes
#####
@@ -254,13 +253,7 @@
with the upstream version of the code living elsewhere. It allows for clear
separation of the Debian specific changes from the upstream code.
-If you want to use merge mode you need to create a tarballs directory for
-the ``.orig.tar.gz`` files::
-
- $ cd path/to/project
- $ mkdir tarballs
-
-Then copy the ``.orig.tar.gz`` file for the current version in to this
+First copy the ``.orig.tar.gz`` file for the current version in to the parent
directory. If you do not have the upstream tarball for the current version,
but you do have a ``watch`` file detailing where it can be found then the
plugin will automatically retrieve the tarballs as they are needed.
=== modified file '__init__.py'
--- a/__init__.py 2008-08-27 12:13:34 +0000
+++ b/__init__.py 2008-08-27 12:54:12 +0000
@@ -420,7 +420,7 @@
"information from, please use the --package "
"option to give the name of the package")
- orig_dir = config.orig_dir or '../tarballs'
+ orig_dir = config.orig_dir or default_orig_dir
orig_dir = os.path.join(tree.basedir, orig_dir)
dest_name = tarball_name(package, version)
@@ -538,7 +538,7 @@
to = snapshot
importer = SnapshotImporter(snapshot, other_sources=files_list)
if initial:
- orig_target = os.path.join(to, '../tarballs')
+ orig_target = os.path.join(to, default_orig_dir)
importer.import_dsc(to, orig_target=orig_target)
else :
inc_to = '.'
@@ -551,7 +551,7 @@
(_default_conf, False)])
orig_target = config.orig_dir
if orig_target is None:
- orig_target = os.path.join(inc_to, '../tarballs')
+ orig_target = os.path.join(inc_to, default_orig_dir)
importer.incremental_import_dsc(inc_to, orig_target=orig_target)
=== modified file 'doc/user_manual/configuration.rst'
--- a/doc/user_manual/configuration.rst 2007-10-23 21:25:20 +0000
+++ b/doc/user_manual/configuration.rst 2008-08-27 12:54:12 +0000
@@ -44,13 +44,12 @@
* ``result-dir = path``
- The directory the resulting files will be placed in. (Defaults to whatever
- is being used for ``build_dir``).
+ The directory the resulting files will be placed in. (Defaults to ``..``)
* ``orig-dir = path``
The directory to search for the ``.orig.tar.gz`` when not in native mode.
- (Defaults to ``../tarballs`` relative to the branch).
+ (Defaults to ``..`` relative to the branch).
Modes
^^^^^
=== modified file 'doc/user_manual/merge.rst'
--- a/doc/user_manual/merge.rst 2008-03-21 17:58:56 +0000
+++ b/doc/user_manual/merge.rst 2008-08-27 12:54:12 +0000
@@ -76,15 +76,12 @@
commit.
Merge mode requires the upstream tarballs to be available when building. By
-default it searches for them in ``../tarballs/``. If you would like to use a
-different location then see the `Configuration Files`_ section. First you
-should create this directory::
-
- $ mkdir ../tarballs/
-
-and then add the upstream tarballs to it. The plugin expects them to be
-named as they would be in a source package, that is the tarball for version
-``0.1`` of ``scruff`` would be::
+default it searches for them in the parent directory. If you would like to use a
+different location then see the `Configuration Files`_ section.
+
+First place the upstream tarball in the parent directory. The plugin expects
+them to be named as they would be in a source package, that is the tarball
+for version ``0.1`` of ``scruff`` would be::
scruff_0.1.orig.tar.gz
@@ -103,7 +100,7 @@
There are three steps to updating a merge mode package to a new upstream
version. The first is to download the new upstream tarball, and place it in
-``../tarballs/``, named as the plugin expects to find it (see above). The
+the parent directory, named as the plugin expects to find it (see above). The
``merge-upstream`` command will automate this part of the process in the
future, but for now it must be done manually.
=== modified file 'doc/user_manual/normal.rst'
--- a/doc/user_manual/normal.rst 2007-10-29 22:04:19 +0000
+++ b/doc/user_manual/normal.rst 2008-08-27 12:54:12 +0000
@@ -97,7 +97,7 @@
The upstream tarball is also converted to the required form, this means that
it is repacked to ``.tar.gz`` format if it is in a different format, and then
renamed to the correct name for the ``.orig.tar.gz`` part of a source package.
-Finally it is placed in the ``../tarballs/`` directory, where later commands
+Finally it is placed in the parent directory, where later commands
will expect to find it. If you do not like this location for the upstream
tarballs you are free to change it, the `Configuration Files`_ section
explains how.
@@ -189,9 +189,9 @@
.. _snapshot.debian.net: http://snapshot.debian.net/
The process places all of the ``.orig.tar.gz`` files from the source packages
-in ``../tarballs/``, as they are required if that version of the package is
+in the parent directory, as they are required if that version of the package is
going to be built. If you do not like to use the disk space for these files
-then they can be deleted, provided they can be replaced from elsewhere. If
+then they can be deleted, provided they can be retrived from elsewhere. If
you do not like the location of those files then you can configure a
different location. See the `Configuration Files`_ section for instructions.
=== modified file 'import_dsc.py'
--- a/import_dsc.py 2008-07-30 14:34:13 +0000
+++ b/import_dsc.py 2008-08-27 12:54:12 +0000
@@ -363,9 +363,10 @@
os.mkdir(self.orig_target)
new_filename = os.path.join(self.orig_target,
os.path.basename(origname))
+ contents = f.read()
new_f = open(new_filename, 'wb')
try:
- new_f.write(f.read())
+ new_f.write(contents)
finally:
new_f.close()
f.close()
More information about the Pkg-bazaar-commits
mailing list