Ubuntu
urlgrabber package

Merge lp://qastaging/~noskcaj/ubuntu/vivid/urlgrabber/3.10.1 into lp://qastaging/ubuntu/vivid/urlgrabber

  1. Vivid (15.04)
  2. 3.10.1
  3. Merge into vivid
Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://qastaging/~noskcaj/ubuntu/vivid/urlgrabber/3.10.1
Merge into: lp://qastaging/ubuntu/vivid/urlgrabber
Diff against target: 7325 lines (+1389/-4846)
26 files modified
.pc/applied-patches (+0/-3)
.pc/grabber_fix.diff/urlgrabber/grabber.py (+0/-1730)
.pc/progress_fix.diff/urlgrabber/progress.py (+0/-755)
.pc/progress_object_callback_fix.diff/urlgrabber/grabber.py (+0/-1802)
ChangeLog (+8/-0)
MANIFEST (+2/-0)
PKG-INFO (+22/-22)
README (+1/-1)
debian/changelog (+7/-0)
debian/patches/grabber_fix.diff (+0/-236)
debian/patches/progress_fix.diff (+0/-11)
debian/patches/progress_object_callback_fix.diff (+0/-21)
debian/patches/series (+0/-3)
scripts/urlgrabber (+14/-6)
scripts/urlgrabber-ext-down (+75/-0)
setup.py (+4/-2)
test/base_test_code.py (+1/-1)
test/munittest.py (+3/-3)
test/test_byterange.py (+1/-13)
test/test_grabber.py (+2/-1)
test/test_mirror.py (+72/-1)
urlgrabber/__init__.py (+5/-4)
urlgrabber/byterange.py (+8/-8)
urlgrabber/grabber.py (+901/-152)
urlgrabber/mirror.py (+54/-11)
urlgrabber/progress.py (+209/-60)
To merge this branch: bzr merge lp://qastaging/~noskcaj/ubuntu/vivid/urlgrabber/3.10.1
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Needs Fixing
Review via email: mp+244676@code.qastaging.launchpad.net

Description of the change

New upstream release, upstreams some patcges

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

daniel@daydream:~/urlgrabber$ bzr merge lp:~noskcaj/ubuntu/vivid/urlgrabber/3.10.1
Unapplying quilt patches to prevent spurious conflicts
+N scripts/urlgrabber-ext-down
 M ChangeLog
 M MANIFEST
 M PKG-INFO
 M README
 M debian/changelog
-D debian/patches/grabber_fix.diff
-D debian/patches/progress_fix.diff
-D debian/patches/progress_object_callback_fix.diff
 M debian/patches/series
 M scripts/urlgrabber
 M setup.py
 M test/base_test_code.py
 M test/munittest.py
 M test/test_byterange.py
 M test/test_grabber.py
 M test/test_mirror.py
 M urlgrabber/__init__.py
 M urlgrabber/byterange.py
 M urlgrabber/grabber.py
 M urlgrabber/mirror.py
 M urlgrabber/progress.py
Text conflict in urlgrabber/grabber.py
1 conflicts encountered.
daniel@daydream:~/urlgrabber$

review: Needs Fixing
Reply

Unmerged revisions

12. By Jackson Doak

* New upstream release.
* Drop all patches, fixed upstream

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: