Mercurial > traipse_dev
changeset 51:14d4270d5e5d traipse_dev
Fixed Auto Update not finding current branch, no pull associated yet!
Removed print statement.
| author | sirebral |
|---|---|
| date | Thu, 06 Aug 2009 09:50:16 -0500 |
| parents | a539bb8371b0 |
| children | c9694d854a61 |
| files | orpg/orpg_version.py upmana/updatemana.py |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/orpg/orpg_version.py Thu Aug 06 09:45:34 2009 -0500 +++ b/orpg/orpg_version.py Thu Aug 06 09:50:16 2009 -0500 @@ -4,7 +4,7 @@ #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) DISTRO = "Traipse Dev" DIS_VER = "Grumpy Goblin" -BUILD = "090806-03" +BUILD = "090806-04" # This version is for network capability. PROTOCOL_VERSION = "1.2"
--- a/upmana/updatemana.py Thu Aug 06 09:45:34 2009 -0500 +++ b/upmana/updatemana.py Thu Aug 06 09:50:16 2009 -0500 @@ -466,7 +466,7 @@ self.AutoUpdate(); self.OnExit() else: pass if self.manifest.GetString('updatemana', 'no_update', '') == 'on' and self.main == False: - print 'no udpate'; self.OnExit() + self.OnExit() else: pass try: self.updater.Show() @@ -479,6 +479,7 @@ self.ui = ui.ui() self.repo = hg.repository(self.ui, ".") self.c = self.repo.changectx('tip') + self.current = self.repo.dirstate.branch() filename = 'ignorelist.txt' self.filename = orpg.dirpath.dir_struct["home"] + 'upmana' + os.sep + filename orpg.tools.validate.Validate(orpg.dirpath.dir_struct["home"] + 'upmana' + os.sep).config_file(filename, "default_ignorelist.txt")