[26701] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r25700 - trunk/debathena/config/lightdm-config/debian

daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sat Aug 4 12:59:16 2012

Date: Sat, 4 Aug 2012 12:59:14 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201208041659.q74GxENl007653@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: jdreed
Date: 2012-08-04 12:59:14 -0400 (Sat, 04 Aug 2012)
New Revision: 25700

Modified:
   trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter
Log:
Actually fallback if motdfile.codename doesn't exist

Modified: trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter
===================================================================
--- trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter	2012-08-04 16:41:13 UTC (rev 25699)
+++ trunk/debathena/config/lightdm-config/debian/debathena-lightdm-greeter	2012-08-04 16:59:14 UTC (rev 25700)
@@ -90,7 +90,7 @@
         if self.appendCodenameToMotd:
             try:
                 codename = subprocess.Popen(["lsb_release", "-s", "-c"], stdout=subprocess.PIPE).communicate()[0]
-                if codename:
+                if codename and os.path.exists(self.motdFilename + "." + codename.strip()):
                     self.motdFilename += "." + codename.strip()
             except OSError:
                 print >>sys.stderr, "Couldn't append codename to motd_filename.  Oh well..."


home help back first fref pref prev next nref lref last post