mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-03-12 15:41:09 +00:00
* requestsync:
- New packages from non-free or contrib go into multiverse (LP: #935643)
This commit is contained in:
parent
18f3109cee
commit
d9bf247dee
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -9,6 +9,8 @@ ubuntu-dev-tools (0.140) UNRELEASED; urgency=low
|
||||
- Prompt to delete existing workdirs (LP: #885514)
|
||||
- Support a BACKPORTPACKAGE_UPLOAD configuration/enviornment variable
|
||||
(LP: #693217)
|
||||
* requestsync:
|
||||
- New packages from non-free or contrib go into multiverse (LP: #935643)
|
||||
|
||||
[ Daniel Hahler ]
|
||||
* ubuntutools/archive.py: use ProxyHandler in _download_file.
|
||||
|
10
requestsync
10
requestsync
@ -206,11 +206,11 @@ def main():
|
||||
ubuntu_srcpkg = get_ubuntu_srcpkg(srcpkg, release)
|
||||
ubuntu_version = Version(ubuntu_srcpkg.getVersion())
|
||||
ubuntu_component = ubuntu_srcpkg.getComponent()
|
||||
newsource = False # override the -n flag
|
||||
newsource = False # override the -n flag
|
||||
except udtexceptions.PackageNotFoundException:
|
||||
ubuntu_srcpkg = None
|
||||
ubuntu_version = Version('~')
|
||||
ubuntu_component = 'universe' # let's assume universe
|
||||
ubuntu_component = None # Set after getting the Debian info
|
||||
if not newsource:
|
||||
print ("'%s' doesn't exist in 'Ubuntu %s'.\n"
|
||||
"Do you want to sync a new package?"
|
||||
@ -227,6 +227,12 @@ def main():
|
||||
print >> sys.stderr, "E: %s" % error
|
||||
sys.exit(1)
|
||||
|
||||
if ubuntu_component is None:
|
||||
if debian_component == 'main':
|
||||
ubuntu_component = 'universe'
|
||||
else:
|
||||
ubuntu_component = 'multiverse'
|
||||
|
||||
# Stop if Ubuntu has already the version from Debian or a newer version
|
||||
if (ubuntu_version >= debian_version) and options.lpapi:
|
||||
# try rmadison
|
||||
|
Loading…
x
Reference in New Issue
Block a user