From 23a2d248d3246ba70f883c1ffd41ac7b76b296b9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 30 Aug 2006 16:15:45 +0200 Subject: * DistUpgrade/Changelog, README, ReleaseAnnouncement - updated to reflect reality * DistUpgrade/DistUpgradeControler.py: - set the permission for the apt.log file to 0644 * DistUpgrade/cdromupgrade: - updated and comments added * po/*: - make update-po --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3f60cb20..2ec2f121 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +update-manager (0.44.5) edgy; urgency=low + + * install the DistUpgrade package too + + -- Michael Vogt Wed, 30 Aug 2006 11:32:24 +0200 + update-manager (0.44.4) edgy; urgency=low * SoftwareProperties/SoftwareProperties.py: -- cgit v1.2.3 From 3d68e37ecbeb1ef2f4af4947daf9cf1d5840c6e7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Sep 2006 12:01:41 +0200 Subject: * data/channels/Ubuntu.info.in: - warty no longer officially supported --- data/channels/Ubuntu.info.in | 4 ++-- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in index 5631e93b..4b6b2b19 100644 --- a/data/channels/Ubuntu.info.in +++ b/data/channels/Ubuntu.info.in @@ -233,7 +233,7 @@ MatchURI: archive.ubuntu.com/ubuntu/ _Description: Ubuntu 4.10 'Warty Warthog' Component: main Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: No longer oficially supported Component: restricted Enabled: 1 _CompDescription: Restricted copyright @@ -251,7 +251,7 @@ _Description: Cdrom with Ubuntu 4.10 'Warty Warthog' Available: False Component: main Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: No longer oficially supported Component: restricted Enabled: 1 _CompDescription: Restricted copyright diff --git a/debian/changelog b/debian/changelog index 2ec2f121..750c1543 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ update-manager (0.44.5) edgy; urgency=low * install the DistUpgrade package too + * data/channels/Ubuntu.info.in: + - warty is no longer officially supported -- Michael Vogt Wed, 30 Aug 2006 11:32:24 +0200 -- cgit v1.2.3 From b6ac0674bd17821a971a4b0e2e2a916eda4d1eb2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 4 Sep 2006 22:57:02 +0200 Subject: * changelog updated --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 750c1543..edae8101 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +update-manager (0.44.6) edgy; urgency=low + + * SoftwareProperties/SoftwareProperties.py: + - fix inconsistency in the new software-sources dialog + + -- Michael Vogt Mon, 4 Sep 2006 22:49:43 +0200 + update-manager (0.44.5) edgy; urgency=low * install the DistUpgrade package too -- cgit v1.2.3 From bfd407a6e42ad43f7ab839b1a603a214109e9eef Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Sep 2006 13:30:19 +0200 Subject: * setup.py: - added missing "+" * changelog: updated --- debian/changelog | 3 +++ setup.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index edae8101..76a8e64d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ update-manager (0.44.6) edgy; urgency=low * SoftwareProperties/SoftwareProperties.py: - fix inconsistency in the new software-sources dialog + * integrate DistUpgrade code into UpdateManager to make sure + that after e.g. a CDROM upgrade the rest of the system can still + be fully upgraded over the net -- Michael Vogt Mon, 4 Sep 2006 22:49:43 +0200 diff --git a/setup.py b/setup.py index c1f40439..90928d8d 100755 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ setup(name='update-manager', glob.glob("DistUpgrade/*.glade") ), ('share/update-manager/', - glob.glob("DistUpgrade/*.cfg") + glob.glob("DistUpgrade/*.cfg")+ glob.glob("DistUpgrade/*.cfg") ), ('share/doc/update-manager', -- cgit v1.2.3 From f1c365239ec308d212e6e26ee1424f036ab85de9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Sep 2006 16:43:48 +0200 Subject: * debian/changelog: updated * update-manager: - run the pre-upgrade code as well --- debian/changelog | 2 +- update-manager | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 76a8e64d..f797ce0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ update-manager (0.44.6) edgy; urgency=low that after e.g. a CDROM upgrade the rest of the system can still be fully upgraded over the net - -- Michael Vogt Mon, 4 Sep 2006 22:49:43 +0200 + -- Michael Vogt Tue, 5 Sep 2006 13:30:22 +0200 update-manager (0.44.5) edgy; urgency=low diff --git a/update-manager b/update-manager index ebd8339a..cfaec01c 100644 --- a/update-manager +++ b/update-manager @@ -74,7 +74,8 @@ if __name__ == "__main__": view.hideStep(STEP_MODIFY_SOURCES) view.hideStep(STEP_REBOOT) controler = DistUpgradeControler(view, datadir=data_dir) - controler.openCache() + controler.prepare() + controler.doPreUpgrade() if controler.askDistUpgrade(): view.setStep(STEP_FETCH_INSTALL) controler.doDistUpgrade() -- cgit v1.2.3 From 486cca122af72382388c7c194945bec783c04f07 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 6 Sep 2006 12:37:14 +0200 Subject: * DistUpgrade/DistUpgradeControler.py: - increased the freespace savety buffer * debian/changelog: - updated (prepared new upload) --- DistUpgrade/Changelog | 2 ++ DistUpgrade/DistUpgradeControler.py | 2 +- debian/changelog | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index 5e7c36bb..33ecff3d 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,3 +1,5 @@ +2006-09-06: + - increased the "free-space-savety-buffer" to 100MB 2006-09-05: - added "RemoveEssentialOk" option and put "sysvinit" into it 2006-09-04: diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index a51fa485..02d25121 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -388,7 +388,7 @@ class DistUpgradeControler(object): free = st_usr[statvfs.F_BAVAIL]*st_usr[statvfs.F_FRSIZE] logging.debug("/usr on different fs than %s, free: %s" % (archivedir, free)) - safety_buffer = 1024*1024*75 # 75 Mb + safety_buffer = 1024*1024*100 # 100 Mb logging.debug("using safety buffer: %s" % safety_buffer) if (self.cache.additionalRequiredSpace+safety_buffer) > free: free_at_least = apt_pkg.SizeToStr(self.cache.additionalRequiredSpace+safety_buffer-free) diff --git a/debian/changelog b/debian/changelog index f797ce0a..3012c6d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +update-manager (0.44.7) edgy; urgency=low + + * UpdateManager/UpdateManager.py: + - be more accurate about dependencies when the user selects only + a supset of the packages + + -- Michael Vogt Wed, 6 Sep 2006 12:29:05 +0200 + update-manager (0.44.6) edgy; urgency=low * SoftwareProperties/SoftwareProperties.py: -- cgit v1.2.3 From b9d9d686af1fc980482b5d0b23c5d29194e35136 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 8 Sep 2006 20:33:48 +0200 Subject: * debian/changelog, debian/dirs - fix missing /var/log/dist-upgrade --- debian/changelog | 6 ++++++ debian/dirs | 1 + 2 files changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3012c6d4..48c59ad8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +update-manager (0.44.8) edgy; urgency=low + + * fix missing /var/log/dist-upgrade + + -- Michael Vogt Fri, 8 Sep 2006 20:33:04 +0200 + update-manager (0.44.7) edgy; urgency=low * UpdateManager/UpdateManager.py: diff --git a/debian/dirs b/debian/dirs index 83916ddf..635898db 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,2 +1,3 @@ var/lib/update-manager +var/log/dist-upgrade usr/bin \ No newline at end of file -- cgit v1.2.3 From e4b06af1ace3bbb4281a9c762113f8a2699116c3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 9 Sep 2006 10:53:25 +0200 Subject: * merged with the latest upload (fix popcon participate value) --- SoftwareProperties/SoftwareProperties.py | 24 ++++++++++++++++++++---- debian/changelog | 7 +++++++ 2 files changed, 27 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index a3dfdd06..a18fec20 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -79,6 +79,7 @@ class SoftwareProperties(SimpleGladeApp): def __init__(self, datadir=None, options=None, parent=None, file=None): gtk.window_set_default_icon_name("software-properties") + self.popconfile = "/etc/popularity-contest.conf" # FIXME: some saner way is needed here if datadir == None: @@ -223,6 +224,22 @@ class SoftwareProperties(SimpleGladeApp): self.treeview_sources.connect("drag_data_received",\ self.on_sources_drag_data_received) + # popcon + if os.path.exists(self.popconfile): + # read it + lines = open(self.popconfile).read().split("\n") + active = False + for line in lines: + try: + (key,value) = line.split("=") + if key == "PARTICIPATE": + if value.strip('"').lower() == "yes": + active = True + except ValueError: + continue + self.checkbutton_popcon.set_active(active) + + # call the add sources.list dialog if we got a file from the cli if self.file != None: self.open_file(file) @@ -505,14 +522,13 @@ class SoftwareProperties(SimpleGladeApp): def on_checkbutton_popcon_toggled(self, widget): """ The user clicked on the popcon paritipcation button """ - popcon = "/etc/popularity-contest.conf" if widget.get_active(): new_value = "yes" else: new_value = "no" - if os.path.exists(popcon): + if os.path.exists(self.popconfile): # read it - lines = open(popcon).read().split("\n") + lines = open(self.popconfile).read().split("\n") for line in lines: try: (key,value) = line.split("=") @@ -521,7 +537,7 @@ class SoftwareProperties(SimpleGladeApp): except ValueError: continue # write it - open(popcon,"w").write("\n".join(lines)) + open(self.popconfile,"w").write("\n".join(lines)) def open_file(self, file): diff --git a/debian/changelog b/debian/changelog index 48c59ad8..230fd67f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +update-manager (0.44.9) edgy; urgency=low + + * SoftwareProperties/SoftwareProperties.py: + - bugfix in the popcon enable code (lp: #59540) + + -- Michael Vogt Sat, 9 Sep 2006 02:13:40 +0200 + update-manager (0.44.8) edgy; urgency=low * fix missing /var/log/dist-upgrade -- cgit v1.2.3