r373 - in trunk: debian src

[Otavio Salvador]

Author: otavio
Date: Thu Nov 25 13:33:58 2004
New Revision: 373

Modified:
   trunk/debian/changelog
   trunk/debian/manpage.sgml
   trunk/src/Config.py
   trunk/src/debpartial-mirror.in
Log:
Release a bugfix release.

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Thu Nov 25 13:33:58 2004
@@ -1,9 +1,21 @@
 debpartial-mirror (0.2.9) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * [Note: This is a bugfix release. All new features and major changes
+     will be included on the 0.3.0 version. This version is current at
+     development stage and you can take a look at it using SVN to do the
+     checkout using:
+  
+      svn co \
+        svn://svn.debian.org/svn/partial-mirror/branches/rewrite \
+        debpartial-mirror
+  
+     Thanks!]
   * Fix some spelling errors.
+  * Backport Vagrant Cascadian manpages fixes, did on rewrite branch.
+  * Apply Vagrant Cascadian to have cleaner download output. Closes: #281303.
+  * Check that local_directory= ends with '/'. Closes: #281399.
 
- -- Otavio Salvador <otavio@debian.org>  Fri,  2 Jul 2004 10:39:31 -0300
+ -- Otavio Salvador <otavio@debian.org>  Thu, 25 Nov 2004 18:33:20 -0200
 
 debpartial-mirror (0.2.8) unstable; urgency=low
 

Modified: trunk/debian/manpage.sgml
==============================================================================
--- trunk/debian/manpage.sgml	(original)
+++ trunk/debian/manpage.sgml	Thu Nov 25 13:33:58 2004
@@ -57,21 +57,21 @@
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>debpartial-mirror is a program to generate Debian partial mirrors.</refpurpose>
+    <refpurpose>debpartial-mirror is a program to generate partial Debian mirrors.</refpurpose>
   </refnamediv>
   <refsect1>
     <title>DESCRIPTION</title>
 
-    <para>This manual page documents briefly the
+    <para>This manual page briefly documents the
       <command>&dhpackage;</command> command.</para>
 
-    <para><command>&dhpackage;</command> is a program for generate a Debian partial mirror</para>
+    <para><command>&dhpackage;</command> is a program to generate partial Debian mirrors</para>
 
   </refsect1>
   <refsect1>
     <title>OPTIONS</title>
 
-    <para>These programs follow the usual &gnu; command line syntax,
+    <para>This program follows the usual &gnu; command line syntax,
       with long options starting with two dashes (`-').  A summary of
       options is included below.</para>
 
@@ -113,7 +113,7 @@
           <option>--skip-files</option>
         </term>
         <listitem>
-          <para>Skip the files of downloading.</para>
+          <para>Skip downloading of files.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -121,7 +121,7 @@
           <option>--skip-packages</option>
         </term>
         <listitem>
-          <para>Skip the packages of downloading.</para>
+          <para>Skip downloading of packages.</para>
         </listitem>
       </varlistentry>
     </variablelist>

Modified: trunk/src/Config.py
==============================================================================
--- trunk/src/Config.py	(original)
+++ trunk/src/Config.py	Thu Nov 25 13:33:58 2004
@@ -92,7 +92,10 @@
         return self.__getMirrorOption("files");
 
     def getLocalDirectory(self):
-        return self.__getMirrorOption("local_directory");
+        r = self.__getMirrorOption("local_directory")
+        if len(r) > 0 and r[-1] != '/':
+            r = r + '/'
+        return r
 
     def getDists(self):
         return self.__dists

Modified: trunk/src/debpartial-mirror.in
==============================================================================
--- trunk/src/debpartial-mirror.in	(original)
+++ trunk/src/debpartial-mirror.in	Thu Nov 25 13:33:58 2004
@@ -209,9 +209,11 @@
                 content_length = int(webPage.headers['content-length'])
 
                 numBytes = 0
+                line = "Getting " + origin + "\n"
+                sys.stdout.write(line)
                 while numBytes < content_length:
-                    line = "Getting " + origin + "... %d%%" % (numBytes * 100 / content_length)
-                    sys.stdout.write(line + '\r')
+                    percent_line = "... %d%%" % (numBytes * 100 / content_length)
+                    sys.stdout.write(percent_line + '\r')
 
                     data = webPage.read(8 * 1024)
                     if not data:
@@ -219,7 +221,7 @@
                     content += data
                     numBytes = numBytes + len(data)
 
-                sys.stdout.write("Getting " + origin + " done.  \n")
+                sys.stdout.write("\rDone " + line)
             else:
                 if directory:
                     content = webPage.read()