Part of Slepp's Projects — Pastebin — TURL — Imagebin — Filebin
Feedback -- English French German Japanese
Create Upload Newest Tools Donate

Paste Actions

Download Raw
Embed
Post to Twitter
Remove Paste

Paste Details

Raw format, 10 years 9 months old.

Advertising

martin
Monday, March 19th, 2007 at 1:19:48pm UTC 

  1. diff -Nru /tmp/DrQC7qRSjo/restricted-manager-0.10/debian/changelog /tmp/2FV7luLnbU/restricted-manager-0.11/debian/changelog
  2. --- /tmp/DrQC7qRSjo/restricted-manager-0.10/debian/changelog    2007-03-16 19:16:50.000000000 +0100
  3. +++ /tmp/2FV7luLnbU/restricted-manager-0.11/debian/changelog    2007-03-19 14:19:40.000000000 +0100
  4. @@ -1,3 +1,30 @@
  5. +restricted-manager (0.11) feisty; urgency=low
  6. +
  7. +  * RestrictedManager/xorg_driver.py: Do not autodetect mouse and monitor when
  8. +    reconfiguring xserver-xorg for a new driver. This avoids clobbering
  9. +    manually added undetected resolutions. (LP: #93643)
  10. +  * po/de.po: Synchronize with Rosetta.
  11. +  * RestrictedManager/nvidia.py: Enable NoLogo by default. (LP: #93306)
  12. +  * RestrictedManager/nvidia.py: Enable AddARGBVisuals to make Beryl work.
  13. +    (LP: #93262)
  14. +  * RestrictedManager/xorg_driver.py: Do not mangle xorg.conf if package
  15. +    download/installation was aborted. (LP: #92573)
  16. +  * RestrictedManager/nvidia.py: Fix passing of driver package name, so that
  17. +    the legacy driver actually installs nvidia-glx-legacy. (LP: #92849, part
  18. +    one)
  19. +  * RestrictedManager/{xorg_driver,nvidia,fglrx}.py: Do not assume that the
  20. +    kernel module name always matches the X.org driver module name
  21. +    (nvidia_legacy vs. nvidia), but instead pass the X.org driver name as a
  22. +    separate attribute. ((LP: #92849, part two)
  23. +  * RestrictedManager/modalias.override: Add NV44A [GeForce 6200] (not covered
  24. +    by nvidia_supported). (LP: #93209)
  25. +  * RestrictedManager/core.py: When loading default or special handlers, check
  26. +    that there is actually a kernel module behind. Otherwise we will display
  27. +    handlers with overrides on platforms which do not actually provide those
  28. +    modules. (LP: #93368)
  29. +
  30. + -- Martin Pitt <[email protected]>  Mon, 19 Mar 2007 14:12:55 +0100
  31. +
  32.  restricted-manager (0.10) feisty; urgency=low
  33.  
  34.    * RestrictedManager/{fglrx,nvidia}.py: Call dpkg-reconfigure xserver-xorg
  35. diff -Nru /tmp/DrQC7qRSjo/restricted-manager-0.10/po/de.po /tmp/2FV7luLnbU/restricted-manager-0.11/po/de.po
  36. --- /tmp/DrQC7qRSjo/restricted-manager-0.10/po/de.po    2007-03-13 19:30:15.000000000 +0100
  37. +++ /tmp/2FV7luLnbU/restricted-manager-0.11/po/de.po    2007-03-19 11:09:17.000000000 +0100
  38. @@ -7,13 +7,14 @@
  39.  msgstr ""
  40.  "Project-Id-Version: restricted-manager 0.1\n"
  41.  "Report-Msgid-Bugs-To: \n"
  42. -"POT-Creation-Date: 2007-03-13 19:30+0100\n"
  43. -"PO-Revision-Date: 2007-02-05 17:57:CET\n"
  44. -"Last-Translator: Martin Pitt <[email protected]>\n"
  45. +"POT-Creation-Date: 2007-03-16 19:43+0000\n"
  46. +"PO-Revision-Date: 2007-03-19 09:13+0000\n"
  47. +"Last-Translator: Sebastian Heinlein <[email protected]>\n"
  48.  "Language-Team: German <[email protected]>\n"
  49.  "MIME-Version: 1.0\n"
  50.  "Content-Type: text/plain; charset=UTF-8\n"
  51.  "Content-Transfer-Encoding: 8bit\n"
  52. +"X-Rosetta-Export-Date: 2007-03-19 09:18+0000\n"
  53.  
  54.  #: ../RestrictedManager/manager.glade.h:1
  55.  msgid "Restricted Drivers"
  56. @@ -23,17 +24,17 @@
  57.  msgid "_Enable"
  58.  msgstr "A_ktivieren"
  59.  
  60. -#: ../RestrictedManager/core.py:384
  61. +#: ../RestrictedManager/core.py:393
  62.  msgid ""
  63.  "This driver is necessary to support the hardware, there is no free/open "
  64.  "alternative.\n"
  65.  "\n"
  66.  "If this driver is not enabled, the hardware will not function in Ubuntu."
  67.  msgstr ""
  68. -"Dieser Treiber ist nötig um die Hardware zu unterstützen. Es gibt keine "
  69. -"freie Alternative.\n"
  70. +"Dieser Treiber ist erforderlich, um Ihre Hardware zu unterstützen, da es zur "
  71. +"Zeit keine freie Alternative gibt.\n"
  72.  "\n"
  73. -"Wenn dieser Treiber nicht eingeschaltet wird, kann Ihre Hardware in Ubuntu "
  74. +"Wenn dieser Treiber nicht eingeschaltet wird, wird Ihre Hardware in Ubuntu "
  75.  "nicht funktionieren."
  76.  
  77.  #: ../RestrictedManager/ipw3945.py:11
  78. @@ -44,18 +45,33 @@
  79.  "If this driver is not enabled, you will not be able to use your wireless "
  80.  "card in Ubuntu."
  81.  msgstr ""
  82. -"Obwohl der Treiber größtenteils frei ist, benötigt er ein Stück proprietärer "
  83. -"Softare, um die Kanäle zu bestimmen, die für die WLAN-Karte verwendet werden "
  84. -"dürfen.\n"
  85. +"Obwohl dieser Treiber größtenteils freie Software ist, benötigt er ein Stück "
  86. +"proprietärer Software, um die Kanäle zu bestimmen, die von Ihrer WLAN-Karte "
  87. +"verwendet werden dürfen.\n"
  88.  "\n"
  89. -"Wenn dieser Treiber nicht aktiviert wird, werden Sie die WLAN-Karte nicht in "
  90. -"Ubuntu verwenden können."
  91. +"Wenn dieser Treiber nicht aktiviert wird, werden Sie Ihre WLAN-Karte in "
  92. +"Ubuntu nicht verwenden können."
  93.  
  94. -#: ../RestrictedManager/nvidia.py:14
  95. +#: ../RestrictedManager/xorg_driver.py:30
  96. +msgid ""
  97. +"Your /etc/x11/xorg.conf has been manually changed. Sorry, restricted-manager "
  98. +"cannot be used with customized configurations.\n"
  99. +"\n"
  100. +"Call \"sudo dpkg-reconfigure -phigh xserver-xorg\"to switch back to "
  101. +"automatic configuration handling."
  102. +msgstr ""
  103. +"Die Konfigurationsdatei /etc/X11/xorg.conf wurde von Hand geändert. Leider "
  104. +"kann das Programm restricted-manager nicht mit individuell angepassten "
  105. +"Konfigurationen verwendet werden.\n"
  106. +"\n"
  107. +"Rufen Sie »sudo dpkg-reconfigure -phigh xserver-xorg« auf, um wieder zu "
  108. +"einer automatischen Konfiguration zu wechseln."
  109. +
  110. +#: ../RestrictedManager/nvidia.py:9
  111.  msgid "NVIDIA accelerated graphics driver"
  112. -msgstr "NVIDIA beschleunigter Grafiktreiber"
  113. +msgstr "beschleunigter Grafiktreiber von NVIDIA"
  114.  
  115. -#: ../RestrictedManager/nvidia.py:15
  116. +#: ../RestrictedManager/nvidia.py:10
  117.  msgid ""
  118.  "This driver is required to fully utilise the 3D potential of NVIDIA graphics "
  119.  "cards, as well as provide 2D acceleration of newer cards.\n"
  120. @@ -67,17 +83,31 @@
  121.  "such as some games."
  122.  msgstr ""
  123.  "Dieser Treiber wird zum vollen Ausschöpfen des 3D-Potentials von NVIDIA-"
  124. -"Grafikkarten benötigt und stellt auch 2D-Beschleunigung auf neueren Karten "
  125. -"bereit.\n"
  126. +"Grafikkarten benötigt und stellt auch 2D-Beschleunigung auf neueren "
  127. +"Grafikkarten bereit.\n"
  128.  "\n"
  129.  "Wenn Sie Desktop-Effekte aktivieren wollen, wird dieser Treiber benötigt.\n"
  130.  "\n"
  131.  "Wenn dieser Treiber nicht aktiviert wird, werden Sie Desktop-Effekte und "
  132. -"Software, die 3D-Beschleunigung braucht (wie Spiele) nicht nutzen können."
  133. +"Software, die 3D-Beschleunigung erfordert (zum Beispiel einige Spiele), "
  134. +"nicht nutzen können."
  135.  
  136. -#: ../RestrictedManager/nvidia.py:115
  137. +#: ../RestrictedManager/nvidia.py:27
  138.  msgid "NVIDIA accelerated graphics driver (legacy cards)"
  139. -msgstr "NVIDIA beschleunigter Grafiktreiber (alte Karten)"
  140. +msgstr "beschleunigter Grafiktreiber von NVIDIA (für ältere Grafikkarten)"
  141. +
  142. +#: ../RestrictedManager/fglrx.py:9
  143. +msgid "ATI accelerated graphics driver"
  144. +msgstr "beschleunigter Grafiktreiber von ATI"
  145. +
  146. +#: ../RestrictedManager/fglrx.py:10
  147. +msgid ""
  148. +"This driver is required to fully utilise the 3D potential of ATI graphics "
  149. +"cards, as well as provide 2D acceleration of newer cards."
  150. +msgstr ""
  151. +"Dieser Treiber wird zum vollen Ausschöpfen des 3D-Potentials von ATI-"
  152. +"Grafikkarten benötigt und stellt auch 2D-Beschleunigung auf neueren "
  153. +"Grafikkarten bereit."
  154.  
  155.  #: ../restricted-manager:65
  156.  msgid "Driver"
  157. @@ -95,49 +125,49 @@
  158.  msgid "_Disable"
  159.  msgstr "_Deaktivieren"
  160.  
  161. -#: ../restricted-manager:163
  162. +#: ../restricted-manager:165
  163.  msgid "Disable the driver?"
  164. -msgstr "Treiber deaktivieren?"
  165. +msgstr "Soll der Treiber deaktiviert werden?"
  166.  
  167. -#: ../restricted-manager:164
  168. +#: ../restricted-manager:166
  169.  msgid "_Disable Driver"
  170.  msgstr "Treiber _deaktivieren"
  171.  
  172. -#: ../restricted-manager:166
  173. +#: ../restricted-manager:168
  174.  msgid "Enable the driver?"
  175. -msgstr "Treiber aktivieren?"
  176. +msgstr "Soll der Treiber aktiviert werden?"
  177.  
  178. -#: ../restricted-manager:167
  179. +#: ../restricted-manager:169
  180.  msgid "_Enable Driver"
  181.  msgstr "Treiber _aktivieren"
  182.  
  183. -#: ../restricted-manager:186
  184. +#: ../restricted-manager:188
  185.  msgid "New Restricted Drivers in use"
  186. -msgstr "Neue eingeschränkte Treiber in Benutzung"
  187. +msgstr "Neue eingeschränkte Treiber werden verwendet"
  188.  
  189. -#: ../restricted-manager:193
  190. +#: ../restricted-manager:195
  191.  msgid "New restricted drivers in use"
  192. -msgstr "Neue eingeschränkte Treiber in Benutzung"
  193. +msgstr "Neue eingeschränkte Treiber werden verwendet"
  194.  
  195. -#: ../restricted-manager:195
  196. +#: ../restricted-manager:197
  197.  msgid ""
  198.  "In order for this computer to function properly, Ubuntu is using driver "
  199.  "software that cannot be supported"
  200.  msgstr ""
  201. -"Damit Ihr Computer ordnungsgemäß funktioniert, kann Ubuntu Treiber-Software "
  202. -"benutzen, die nicht unterstützt werden kann."
  203. +"Damit Ihr Computer ordnungsgemäß funktioniert, verwendet Ubuntu Treiber-"
  204. +"Software, die nicht unterstützt werden kann."
  205.  
  206. -#: ../restricted-manager:197
  207. +#: ../restricted-manager:199
  208.  msgid "Click on this icon to open the Restricted Drivers control panel."
  209.  msgstr ""
  210. -"Klicken Sie auf dieses Icon um das Kontrollpanel für eingeschränkte Treiber "
  211. -"zu öffnen"
  212. +"Klicken Sie auf dieses Symbol, um die Einstellungen für eingeschränkte "
  213. +"Treiber zu öffnen."
  214.  
  215. -#: ../restricted-manager:209 ../autostart/restricted-manager.desktop.in.h:2
  216. +#: ../restricted-manager:211 ../autostart/restricted-manager.desktop.in.h:2
  217.  msgid "Restricted Drivers manager"
  218. -msgstr "Verwaltung von eingeschränkten Treibern"
  219. +msgstr "Verwaltung eingeschränkter Treiber"
  220.  
  221. -#: ../restricted-manager:224
  222. +#: ../restricted-manager:226
  223.  msgid ""
  224.  "In order for this computer to function properly, Ubuntu may be using driver "
  225.  "software that cannot be supported."
  226. @@ -145,53 +175,64 @@
  227.  "Damit Ihr Computer ordnungsgemäß funktioniert, kann Ubuntu Treiber-Software "
  228.  "benutzen, die nicht unterstützt werden kann."
  229.  
  230. -#: ../restricted-manager:225
  231. +#: ../restricted-manager:227
  232.  msgid ""
  233.  "Because the software is proprietary, it cannot easily be changed to fix any "
  234.  "future problems."
  235.  msgstr ""
  236. -"Weil diese Software proprietär ist, ist es problematisch, sie zu ändern um "
  237. -"zukünftige Probleme zu lösen."
  238. +"Da diese Software nicht frei ist, ist es nur erschwert möglich auftretende "
  239. +"Probleme und Fehler zu beheben."
  240.  
  241. -#: ../restricted-manager:229
  242. +#: ../restricted-manager:231
  243.  msgid "Must be run as member of admin group"
  244.  msgstr ""
  245. +"Dieser Vorgang kann nur von Mitgliedern der Gruppe »admin« ausgeführt werden."
  246.  
  247. -#: ../restricted-manager:267
  248. +#: ../restricted-manager:272
  249.  msgid "Must be run as root"
  250. -msgstr ""
  251. +msgstr "Dieser Vorgang kann nur vom Benutzer »root« ausgeführt werden."
  252.  
  253. -#: ../restricted-manager:274
  254. +#: ../restricted-manager:279
  255.  #, c-format
  256.  msgid "Unknown module: %s"
  257. -msgstr ""
  258. +msgstr "Unbekanntes Modul: %s"
  259.  
  260. -#: ../restricted-manager:278
  261. +#: ../restricted-manager:283
  262.  #, c-format
  263.  msgid "%s is already enabled"
  264. -msgstr ""
  265. +msgstr "%s ist bereits aktiviert"
  266.  
  267. -#: ../restricted-manager:309
  268. +#: ../restricted-manager:328
  269. +msgid "Your hardware does not need any restricted drivers."
  270. +msgstr "Ihre Hardware erfordert keine eingeschränkten Treiber."
  271. +
  272. +#: ../restricted-manager:340
  273.  msgid "Update restricted modules list"
  274. -msgstr ""
  275. +msgstr "Liste der eingeschränkten Treiber aktualisieren"
  276.  
  277. -#: ../restricted-manager:310
  278. +#: ../restricted-manager:343
  279.  msgid "Check for newly used restricted modules"
  280. -msgstr ""
  281. -
  282. -#: ../restricted-manager:311
  283. -msgid "Enable the named module"
  284. -msgstr ""
  285. +msgstr "Auf neu benutzte eingeschränkte Treiber überprüfen"
  286.  
  287. -#: ../restricted-manager:312
  288. -msgid "Disable the named module"
  289. -msgstr ""
  290. +#: ../restricted-manager:346
  291. +msgid "List available restricted modules"
  292. +msgstr "Verfügbare eingeschränkte Treiber auflisten"
  293.  
  294. -#: ../restricted-manager:313
  295. +#: ../restricted-manager:349
  296.  msgid ""
  297.  "Check if there is a graphics driver available that supports composite and "
  298.  "offer to enable it"
  299.  msgstr ""
  300. +"Überprüfen, ob ein Grafiktreiber verfügbar ist, der die Composite-"
  301. +"Erweiterung unterstützt, und gegebenenfalls anbieten, diesen zu aktivieren"
  302. +
  303. +#: ../restricted-manager:352
  304. +msgid "Enable the named module"
  305. +msgstr "Den angegebenen Treiber aktivieren"
  306. +
  307. +#: ../restricted-manager:355
  308. +msgid "Disable the named module"
  309. +msgstr "Den angegebenen Treiber deaktivieren"
  310.  
  311.  #: ../applications/restricted-manager.desktop.in.h:1
  312.  #: ../autostart/restricted-manager.desktop.in.h:1
  313. @@ -200,4 +241,4 @@
  314.  
  315.  #: ../applications/restricted-manager.desktop.in.h:2
  316.  msgid "Restricted Drivers Manager"
  317. -msgstr "Verwaltung von eingeschränkten Treibern"
  318. +msgstr "Verwaltung von eingeschränkten Treibern"
  319. \ Kein Zeilenumbruch am Dateiende.
  320. diff -Nru /tmp/DrQC7qRSjo/restricted-manager-0.10/RestrictedManager/core.py /tmp/2FV7luLnbU/restricted-manager-0.11/RestrictedManager/core.py
  321. --- /tmp/DrQC7qRSjo/restricted-manager-0.10/RestrictedManager/core.py   2007-03-16 19:02:02.000000000 +0100
  322. +++ /tmp/2FV7luLnbU/restricted-manager-0.11/RestrictedManager/core.py   2007-03-19 14:12:04.000000000 +0100
  323. @@ -48,6 +48,8 @@
  324.      """Return the information about the module as a dict."""
  325.      proc = subprocess.Popen(("modinfo", module), stdout=subprocess.PIPE)
  326.      (stdout, stderr) = proc.communicate()
  327. +    if proc.returncode != 0:
  328. +        return None
  329.  
  330.      modinfo = {}
  331.      for line in stdout.split("\n"):
  332. @@ -136,6 +138,8 @@
  333.              module.replace("-", "_")
  334.  
  335.              modinfo = get_modinfo(module_filename)
  336. +            if modinfo is None:
  337. +                continue
  338.              license = modinfo.get("license", ["unknown"])[0]
  339.              gplok = is_license_gpl_compatible(license)
  340.  
  341. @@ -313,16 +317,23 @@
  342.          for attr in dir(pymod):
  343.              obj = getattr(pymod, attr)
  344.              if hasattr(obj, "is_handler"):
  345. -                specials[obj.name] = obj(obj.name)
  346. +                h = obj(obj.name)
  347. +                if h._modinfo:
  348. +                    specials[obj.name] = obj(obj.name)
  349.  
  350.      return specials
  351.  
  352.  def get_handler(specials, module):
  353.      """Return the handler for the module."""
  354.      if module in specials:
  355. -        return specials[module]
  356. +        h = specials[module]
  357.      else:
  358. -        return DefaultHandler(module)
  359. +        h = DefaultHandler(module)
  360. +
  361. +    if h._modinfo:
  362. +        return h
  363. +    else:
  364. +        return None
  365.  
  366.  def get_handlers():
  367.      """Return a dictionary of restricted driver handlers."""
  368. @@ -333,7 +344,8 @@
  369.      handlers = {}
  370.      for module in hardware:
  371.          handler = get_handler(specials, module)
  372. -        handlers[handler.name] = handler
  373. +        if handler:
  374. +            handlers[handler.name] = handler
  375.      for module, handler in specials.items():
  376.          if module not in restricted:
  377.              handlers[module] = handler
  378. diff -Nru /tmp/DrQC7qRSjo/restricted-manager-0.10/RestrictedManager/fglrx.py /tmp/2FV7luLnbU/restricted-manager-0.11/RestrictedManager/fglrx.py
  379. --- /tmp/DrQC7qRSjo/restricted-manager-0.10/RestrictedManager/fglrx.py  2007-03-16 17:45:15.000000000 +0100
  380. +++ /tmp/2FV7luLnbU/restricted-manager-0.11/RestrictedManager/fglrx.py  2007-03-19 13:05:59.000000000 +0100
  381. @@ -12,6 +12,6 @@
  382.                   "acceleration of newer cards.")
  383.  
  384.      def __init__(self, module):
  385. -        XorgDriverHandler.__init__(self, module, "xorg-driver-fglrx", "",
  386. -            "ati", ["glx"], [])
  387. +        XorgDriverHandler.__init__(self, module, "xorg-driver-fglrx", "fglrx",
  388. +            "", "ati", ["glx"], [])
  389.  
  390. diff -Nru /tmp/DrQC7qRSjo/restricted-manager-0.10/RestrictedManager/modalias.append /tmp/2FV7luLnbU/restricted-manager-0.11/RestrictedManager/modalias.append
  391. --- /tmp/DrQC7qRSjo/restricted-manager-0.10/RestrictedManager/modalias.append   2007-03-16 17:06:16.000000000 +0100
  392. +++ /tmp/2FV7luLnbU/restricted-manager-0.11/RestrictedManager/modalias.append   2007-03-19 13:22:55.000000000 +0100
  393. @@ -230,3 +230,7 @@
  394.  alias pci:v0000168Cd00000012sv*sd*bc*sc*i* ath_hal
  395.  alias pci:v0000168Cd00000007sv*sd*bc*sc*i* ath_hal
  396.  
  397. +# nVidia cards which are not covered by nvidia_supported
  398. +#   NV44A [GeForce 6200] (rev a1)
  399. +alias pci:v000010DEd00000221sv*sd*bc*sc*i* nvidia
  400. +
  401. diff -Nru /tmp/DrQC7qRSjo/restricted-manager-0.10/RestrictedManager/nvidia.py /tmp/2FV7luLnbU/restricted-manager-0.11/RestrictedManager/nvidia.py
  402. --- /tmp/DrQC7qRSjo/restricted-manager-0.10/RestrictedManager/nvidia.py 2007-03-16 17:54:41.000000000 +0100
  403. +++ /tmp/2FV7luLnbU/restricted-manager-0.11/RestrictedManager/nvidia.py 2007-03-19 13:07:24.000000000 +0100
  404. @@ -16,16 +16,17 @@
  405.                   "enable desktop effects and will not be able to run software "
  406.                   "that requires 3D acceleration, such as some games.")
  407.  
  408. -    def __init__(self, module, extra_options = "AddARGBGLXVisuals True"):
  409. -        XorgDriverHandler.__init__(self, module, "nvidia-glx", extra_options,
  410. -            "nv", ["glx"], ["dri", "GLcore"])
  411. +    def __init__(self, module,
  412. +        driver_package = "nvidia-glx",
  413. +        extra_options = "AddARGBVisuals True\\nAddARGBGLXVisuals True\\nNoLogo True"):
  414. +        XorgDriverHandler.__init__(self, module, driver_package, "nvidia",
  415. +            extra_options, "nv", ["glx"], ["dri", "GLcore"])
  416.  
  417.  class LegacyNvidiaDriver(NvidiaDriver):
  418.      is_handler = True
  419.  
  420.      name = "nvidia_legacy"
  421.      description = _("NVIDIA accelerated graphics driver (legacy cards)")
  422. -    driver_package = 'nvidia-glx-legacy'
  423.  
  424.      def __init__(self, module):
  425. -        NvidiaDriver.__init__(self, module, "")
  426. +        NvidiaDriver.__init__(self, module, "nvidia-glx-legacy", "")
  427. diff -Nru /tmp/DrQC7qRSjo/restricted-manager-0.10/RestrictedManager/xorg_driver.py /tmp/2FV7luLnbU/restricted-manager-0.11/RestrictedManager/xorg_driver.py
  428. --- /tmp/DrQC7qRSjo/restricted-manager-0.10/RestrictedManager/xorg_driver.py    2007-03-16 19:07:56.000000000 +0100
  429. +++ /tmp/2FV7luLnbU/restricted-manager-0.11/RestrictedManager/xorg_driver.py    2007-03-19 13:08:32.000000000 +0100
  430. @@ -9,13 +9,14 @@
  431.  class XorgDriverHandler(DefaultHandler):
  432.      """Abstract class for a restricted X.org graphics driver."""
  433.  
  434. -    def __init__(self, module, driver_package, extra_conf_options, free_driver,
  435. -        add_modules, remove_modules):
  436. +    def __init__(self, module, driver_package, xorg_driver, extra_conf_options,
  437. +        free_driver, add_modules, remove_modules):
  438.          """Build graphics driver handler for a particular concrete kernel
  439.          module."""
  440.  
  441.          DefaultHandler.__init__(self, module)
  442.          self.driver_package = driver_package
  443. +        self.xorg_driver = xorg_driver
  444.          self.extra_xorg_driver_options = extra_conf_options
  445.          self.free_driver = free_driver
  446.          self.add_modules = add_modules
  447. @@ -41,7 +42,7 @@
  448.          driver = dc.get("xserver-xorg/config/device/driver")
  449.          dc.shutdown()
  450.  
  451. -        return driver == self.name and self.package_installed(self.driver_package)
  452. +        return driver == self.xorg_driver and self.package_installed(self.driver_package)
  453.  
  454.      def enable(self):
  455.          """Enable the module."""
  456. @@ -51,6 +52,10 @@
  457.          if not self.package_installed(self.driver_package):
  458.              self.install_package(self.driver_package)
  459.  
  460. +        # do not mangle xorg.conf if package installation has been aborted
  461. +        if not self.package_installed(self.driver_package):
  462. +            return
  463. +
  464.          dc = debconf.DebconfCommunicator("restricted-manager")
  465.          dc.capb('escape')
  466.  
  467. @@ -58,12 +63,19 @@
  468.          cur_driver = dc.get("xserver-xorg/config/device/driver")
  469.          open(os.path.join(MANAGER_ROOT, self.name + ".olddriver"), "w").write(cur_driver)
  470.  
  471. -        dc.set("xserver-xorg/config/device/driver", self.name)
  472. +        dc.set("xserver-xorg/config/device/driver", self.xorg_driver)
  473.          dc.fset("xserver-xorg/config/device/driver", "seen", "true")
  474.  
  475. -        # don't let xserver-xorg clobber our selected driver
  476. +        # don't let xserver-xorg clobber our selected driver and previous
  477. +        # settings
  478.          dc.set("xserver-xorg/autodetect_video_card", "false")
  479.          dc.fset("xserver-xorg/autodetect_video_card", "seen", "true")
  480. +        auto_monitor = dc.get("xserver-xorg/autodetect_monitor")
  481. +        dc.set("xserver-xorg/autodetect_monitor", "false")
  482. +        dc.fset("xserver-xorg/autodetect_monitor", "seen", "true")
  483. +        auto_mouse = dc.get("xserver-xorg/autodetect_mouse")
  484. +        dc.set("xserver-xorg/autodetect_mouse", "false")
  485. +        dc.fset("xserver-xorg/autodetect_mouse", "seen", "true")
  486.  
  487.          modules = dc.get("xserver-xorg/config/modules").split(", ")
  488.          for m in self.remove_modules:
  489. @@ -94,6 +106,12 @@
  490.          subprocess.call(['dpkg-reconfigure', '-fnoninteractive', '-pcritical',
  491.              'xserver-xorg'])
  492.  
  493. +        # restore our clobbered autodetection values
  494. +        dc = debconf.DebconfCommunicator("restricted-manager")
  495. +        dc.set("xserver-xorg/autodetect_monitor", auto_monitor)
  496. +        dc.set("xserver-xorg/autodetect_mouse", auto_mouse)
  497. +        dc.shutdown()
  498. +
  499.          print >> log, '*** Enabling', self.name, ': debconf dump after dpkg-reconfigure:'
  500.          log.flush()
  501.          subprocess.call(['grep', '-A', '5', '^Name: xserver-xorg',
  502. @@ -130,6 +148,12 @@
  503.          # let xserver-xorg override our free driver if it wants to
  504.          dc.set("xserver-xorg/autodetect_video_card", "true")
  505.          dc.fset("xserver-xorg/autodetect_video_card", "seen", "true")
  506. +        auto_monitor = dc.get("xserver-xorg/autodetect_monitor")
  507. +        dc.set("xserver-xorg/autodetect_monitor", "false")
  508. +        dc.fset("xserver-xorg/autodetect_monitor", "seen", "true")
  509. +        auto_mouse = dc.get("xserver-xorg/autodetect_mouse")
  510. +        dc.set("xserver-xorg/autodetect_mouse", "false")
  511. +        dc.fset("xserver-xorg/autodetect_mouse", "seen", "true")
  512.  
  513.          modules = dc.get("xserver-xorg/config/modules").split(", ")
  514.          for m in self.add_modules:
  515. @@ -148,4 +172,10 @@
  516.          subprocess.call(['dpkg-reconfigure', '-fnoninteractive', '-pcritical',
  517.              'xserver-xorg'])
  518.  
  519. +        # restore our clobbered autodetection values
  520. +        dc = debconf.DebconfCommunicator("restricted-manager")
  521. +        dc.set("xserver-xorg/autodetect_monitor", auto_monitor)
  522. +        dc.set("xserver-xorg/autodetect_mouse", auto_mouse)
  523. +        dc.shutdown()
  524. +
  525.          notify_reboot_required()
  526. Binärdateien /tmp/DrQC7qRSjo/restricted-manager-0.10/.swo and /tmp/2FV7luLnbU/restricted-manager-0.11/.swo sind verschieden.

advertising

Update the Post

Either update this post and resubmit it with changes, or make a new post.

You may also comment on this post.

update paste below
details of the post (optional)

Note: Only the paste content is required, though the following information can be useful to others.

Save name / title?

(space separated, optional)



Please note that information posted here will not expire by default. If you do not want it to expire, please set the expiry time above. If it is set to expire, web search engines will not be allowed to index it prior to it expiring. Items that are not marked to expire will be indexable by search engines. Be careful with your passwords. All illegal activities will be reported and any information will be handed over to the authorities, so be good.

comments powered by Disqus
worth-right
worth-right