diff -uNrp sos-2.2.orig/gpgkeys/gpg.template sos-2.2/gpgkeys/gpg.template --- sos-2.2.orig/gpgkeys/gpg.template 2007-10-05 09:56:44.000000000 +0000 +++ sos-2.2/gpgkeys/gpg.template 2014-10-15 14:03:18.829823783 +0000 @@ -3,7 +3,7 @@ Key-Type: DSA Key-Length: 1024 Subkey-Type: ELG-E Subkey-Length: 1024 -Name-Real: Red Hat Support +Name-Real: CentOS Support Name-Comment: SoS Encryption Key Name-Email: support@redhat.com Expire-Date: 0 diff -uNrp sos-2.2.orig/man/en/sosreport.1 sos-2.2/man/en/sosreport.1 --- sos-2.2.orig/man/en/sosreport.1 2014-10-15 13:58:24.941239000 +0000 +++ sos-2.2/man/en/sosreport.1 2014-10-15 14:04:41.700706517 +0000 @@ -42,7 +42,7 @@ If no value is specified and the option Enable all (boolean) options for all loaded plugins. .TP .B \-u FTP_SERVER, --upload FTP_SERVER -Upload the report to Red Hat (use exclusively if advised from a Red Hat support representative). +Upload the report to CentOS (use exclusively if advised from a CentOS support representative). For further options for automated uploads please refer to the documentation for \fBredhat-support-tool\fR. .TP .B \-v, \--verbose diff -uNrp sos-2.2.orig/po/af.po sos-2.2/po/af.po --- sos-2.2.orig/po/af.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/af.po 2014-10-15 14:03:18.829823783 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/as.po sos-2.2/po/as.po --- sos-2.2.orig/po/as.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/as.po 2014-10-15 14:03:18.830823781 +0000 @@ -66,14 +66,14 @@ msgid "Cannot upload to specified URL." msgstr "উল্লিখিত URL-এ আপলোড কৰিবলৈ ব্যৰ্থ ।" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "আপোনাৰ ৰিপোৰ্টটি Red Hat সহায়তা ব্যৱস্থাত আপলোড কৰিবলৈ সমস্যা ।" +msgid "There was a problem uploading your report to CentOS support." +msgstr "আপোনাৰ ৰিপোৰ্টটি CentOS সহায়তা ব্যৱস্থাত আপলোড কৰিবলৈ সমস্যা ।" #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" msgstr "" -"আপোনাৰ প্ৰদত্ত ৰিপোৰ্ট সফলতাৰে সৈতে Red Hat-ৰ ftp সেৱকত নিম্নলিখিত নামত আপলোড " +"আপোনাৰ প্ৰদত্ত ৰিপোৰ্ট সফলতাৰে সৈতে CentOS-ৰ ftp সেৱকত নিম্নলিখিত নামত আপলোড " "কৰা হৈছে:" #: ../sos/policyredhat.py:402 @@ -145,11 +145,11 @@ msgid "" "No changes will be made to your system.\n" "\n" msgstr "" -"এই সামগ্ৰীৰ সহায়ত যান্ত্ৰিক সামগ্ৰী আৰু Red Hat Enterprise Linux\n" +"এই সামগ্ৰীৰ সহায়ত যান্ত্ৰিক সামগ্ৰী আৰু CentOS Enterprise Linux\n" "প্ৰণালীৰ প্ৰতিষ্ঠা সম্পৰ্কে বিশদ তথ্য সংগ্ৰহ কৰা হ'ব ।\n" "তথ্য সংগ্ৰহৰ পিছত /tmp পঞ্জিকাৰ অধীন এটা আৰ্কাইভ নিৰ্মিত হয় ।\n" "এই আৰ্কাইভ আপুনি সহায়তা প্ৰতিনিধিৰ কাশত পঠায় দিব পাৰে ।\n" -"Red Hat দ্বাৰা এই তথ্য অকল সমস্যাৰ কাৰণ নিৰ্ণয় কৰাৰ বাবে ব্যৱহাৰ কৰা হ'ব\n" +"CentOS দ্বাৰা এই তথ্য অকল সমস্যাৰ কাৰণ নিৰ্ণয় কৰাৰ বাবে ব্যৱহাৰ কৰা হ'ব\n" "আৰু ইয়াৰ গোপনীয়তা বজায় ৰাখা হ'ব ।\n" "\n" "এই কাম সম্পন্ন হ'বলৈ কিছু সময় ব্যয় হ'ব পাৰে ।\n" diff -uNrp sos-2.2.orig/po/ast.po sos-2.2/po/ast.po --- sos-2.2.orig/po/ast.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/ast.po 2014-10-15 14:03:18.830823781 +0000 @@ -66,14 +66,14 @@ msgid "Cannot upload to specified URL." msgstr "Nun se puede cargar a la URL especificada." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" -"Hebo un problema al cargar el to informe al equipu d'asistencia de Red Hat" +"Hebo un problema al cargar el to informe al equipu d'asistencia de CentOS" #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" -msgstr "El to informe cargóse bien a los sirvidores ftp e Red Hat col nome:" +msgstr "El to informe cargóse bien a los sirvidores ftp e CentOS col nome:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -145,10 +145,10 @@ msgid "" "\n" msgstr "" "Esta utilidá recueyerá dalguna información detallada sobro'l\n" -"hardware y la configuración del to sistema Red Hat Enterprise Linux.\n" +"hardware y la configuración del to sistema CentOS Enterprise Linux.\n" "La información recuéyese y críase un ficheru baxo /tmp.\n" "Ésti puede mandase al to representante de sofitu.\n" -"Red Hat usará esta información pa diagnosticar el sistema\n" +"CentOS usará esta información pa diagnosticar el sistema\n" "únicamente y considerará esta información como confidencial.\n" "\n" "Esti procesu va llevar un tiempu pa completase.\n" diff -uNrp sos-2.2.orig/po/be.po sos-2.2/po/be.po --- sos-2.2.orig/po/be.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/be.po 2014-10-15 14:03:18.830823781 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/bg.po sos-2.2/po/bg.po --- sos-2.2.orig/po/bg.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/bg.po 2014-10-15 14:03:18.830823781 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/bn_IN.po sos-2.2/po/bn_IN.po --- sos-2.2.orig/po/bn_IN.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/bn_IN.po 2014-10-15 14:03:18.831823780 +0000 @@ -66,14 +66,14 @@ msgid "Cannot upload to specified URL." msgstr "উল্লিখিত URL-এ আপলোড করতে ব্যর্থ।" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "আপনার রিপোর্টটি Red Hat সহায়তা ব্যবস্থায় আপলোড করতে সমস্যা।" +msgid "There was a problem uploading your report to CentOS support." +msgstr "আপনার রিপোর্টটি CentOS সহায়তা ব্যবস্থায় আপলোড করতে সমস্যা।" #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" msgstr "" -"আপনার প্রদত্ত রিপোর্টটি সাফল্যের সাথে Red Hat-র ftp সার্ভারে নিম্নলিখিত নামে আপলোড " +"আপনার প্রদত্ত রিপোর্টটি সাফল্যের সাথে CentOS-র ftp সার্ভারে নিম্নলিখিত নামে আপলোড " "করা হয়েছে:" #: ../sos/policyredhat.py:402 @@ -145,11 +145,11 @@ msgid "" "No changes will be made to your system.\n" "\n" msgstr "" -"এই সামগ্রীর সাহায্যে হার্ডওয়্যার ও Red Hat Enterprise Linux\n" +"এই সামগ্রীর সাহায্যে হার্ডওয়্যার ও CentOS Enterprise Linux\n" "সিস্টেমের পরিকাঠামো সম্পর্কে বিশদ তথ্য সংগ্রহ করা হবে।\n" "তথ্য সংগ্রহের পরে /tmp ডিরেক্টরির অধীন একটি আর্কাইভ নির্মিত হয়।\n" "এই আর্কাইভটি আপনি সহায়তা প্রতিনিধির কাছে পাঠিয়ে দিতে পারবেন।\n" -"Red Hat দ্বারা এই তথ্য শুধমাত্র সমস্যার কারণ নির্ণয় করার জন্য ব্যবহার করা হবে\n" +"CentOS দ্বারা এই তথ্য শুধমাত্র সমস্যার কারণ নির্ণয় করার জন্য ব্যবহার করা হবে\n" "এবং এর গোপনীয়তা বজায় রাখা হবে।\n" "\n" "এই কর্ম সম্পন্ন হতে কিছু সময় ব্যয় হতে পারে।\n" diff -uNrp sos-2.2.orig/po/bn.po sos-2.2/po/bn.po --- sos-2.2.orig/po/bn.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/bn.po 2014-10-15 14:03:18.831823780 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/bs.po sos-2.2/po/bs.po --- sos-2.2.orig/po/bs.po 2010-04-17 02:45:18.000000000 +0000 +++ sos-2.2/po/bs.po 2014-10-15 14:03:18.831823780 +0000 @@ -66,8 +66,8 @@ msgid "no valid plugins found" msgstr "ispravan plugin nije nadjen" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Bilo je problema u postavljanju vaseg izvjestaja na Red Hat podrsku. " +msgid "There was a problem uploading your report to CentOS support." +msgstr "Bilo je problema u postavljanju vaseg izvjestaja na CentOS podrsku. " #: ../sos/policyredhat.py:360 msgid "Cannot upload to specified URL." diff -uNrp sos-2.2.orig/po/ca.po sos-2.2/po/ca.po --- sos-2.2.orig/po/ca.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/ca.po 2014-10-15 14:03:18.832823778 +0000 @@ -76,14 +76,14 @@ msgid "Cannot upload to specified URL." msgstr "No es pot pujar a la URL especificada." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Hi ha hagut un problema en pujar l'informe al manteniment de Red Hat." +msgid "There was a problem uploading your report to CentOS support." +msgstr "Hi ha hagut un problema en pujar l'informe al manteniment de CentOS." #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" msgstr "" -"L'informe s'ha pujat correctament al servidor d'ftp de Red Hat amb el nom:" +"L'informe s'ha pujat correctament al servidor d'ftp de CentOS amb el nom:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -160,7 +160,7 @@ msgstr "" "el maquinari i la configuració del vostre sistema Red Had Enterprise Linux.\n" "La informació recollida és adjuntada i desada en un arxiu en el directori\n" "/tmp, que podeu enviar a la persona encarregada del manteniment.\n" -"Red Hat utilitzarà aquesta informació únicament per a diagnòstics\n" +"CentOS utilitzarà aquesta informació únicament per a diagnòstics\n" "i es considerarà informació confidencial.\n" "\n" "Aquest procés pot tardar una mica en completar-se.\n" diff -uNrp sos-2.2.orig/po/cs.po sos-2.2/po/cs.po --- sos-2.2.orig/po/cs.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/cs.po 2014-10-15 14:03:18.832823778 +0000 @@ -65,13 +65,13 @@ msgid "Cannot upload to specified URL." msgstr "Nelze uložit na uvedené URL." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Při odesílání zprávy do firmy Red Hat vznikla chyba." +msgid "There was a problem uploading your report to CentOS support." +msgstr "Při odesílání zprávy do firmy CentOS vznikla chyba." #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" -msgstr "Vaše zpráva byla úspěšně odeslána na FTP server firmy Red Hat:" +msgstr "Vaše zpráva byla úspěšně odeslána na FTP server firmy CentOS:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." diff -uNrp sos-2.2.orig/po/cy.po sos-2.2/po/cy.po --- sos-2.2.orig/po/cy.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/cy.po 2014-10-15 14:03:18.832823778 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/da.po sos-2.2/po/da.po --- sos-2.2.orig/po/da.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/da.po 2014-10-15 14:03:18.833823777 +0000 @@ -65,9 +65,9 @@ msgid "Cannot upload to specified URL." msgstr "Kan ikke overføre til den angivne URL." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" -"Der opstod et problem under overførsel af din rapport til Red Hat-support." +"Der opstod et problem under overførsel af din rapport til CentOS-support." #: ../sos/policyredhat.py:399 #, python-format diff -uNrp sos-2.2.orig/po/de_CH.po sos-2.2/po/de_CH.po --- sos-2.2.orig/po/de_CH.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/de_CH.po 2014-10-15 14:03:18.833823777 +0000 @@ -68,14 +68,14 @@ msgid "Cannot upload to specified URL." msgstr "Hochladen zu speziellem URL scheiterte." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Beim Hochladen Ihres Berichts zum Red Hat Support trat ein Fehler auf." +msgid "There was a problem uploading your report to CentOS support." +msgstr "Beim Hochladen Ihres Berichts zum CentOS Support trat ein Fehler auf." #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" msgstr "" -"Ihr Bericht wurde erfolgreich auf den Red Hat FTP-Server hochgeladen, mit " +"Ihr Bericht wurde erfolgreich auf den CentOS FTP-Server hochgeladen, mit " "dem Namen:" #: ../sos/policyredhat.py:402 @@ -148,10 +148,10 @@ msgid "" "\n" msgstr "" "Dieses Dienstprogramm sammelt einige detaillierte Informationen\n" -"zur Hardware und Einrichtung Ihres Red Hat Enterprise Linux Systems.\n" +"zur Hardware und Einrichtung Ihres CentOS Enterprise Linux Systems.\n" "Die Informationen werden gesammelt und in einem Archiv unter /tmp\n" "zusammengefasst, welches Sie an einen Support-Vertreter schicken\n" -"können. Red Hat verwendet diese Informationen AUSSCHLIESSLICH zu\n" +"können. CentOS verwendet diese Informationen AUSSCHLIESSLICH zu\n" "Diagnosezwecken und behandelt sie als vertrauliche Informationen.\n" "\n" "Die Fertigstellung dieses Prozesses kann eine Weile dauern.\n" diff -uNrp sos-2.2.orig/po/de.po sos-2.2/po/de.po --- sos-2.2.orig/po/de.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/de.po 2014-10-15 14:03:18.833823777 +0000 @@ -71,8 +71,8 @@ msgid "Cannot upload to specified URL." msgstr "Hochladen zu spezieller URL scheiterte." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Beim Hochladen Ihres Berichts zum Red Hat Support trat ein Fehler auf." +msgid "There was a problem uploading your report to CentOS support." +msgstr "Beim Hochladen Ihres Berichts zum CentOS Support trat ein Fehler auf." #: ../sos/policyredhat.py:399 #, python-format diff -uNrp sos-2.2.orig/po/el.po sos-2.2/po/el.po --- sos-2.2.orig/po/el.po 2010-05-19 13:40:31.000000000 +0000 +++ sos-2.2/po/el.po 2014-10-15 14:03:18.834823775 +0000 @@ -59,13 +59,13 @@ msgid "Cannot upload to specified URL." msgstr "Δεν είναι δυνατό το upload στο καθορισμένο URL." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Υπήρξε ένα πρόβλημα κατα το upload της αναφοράς σας στην Red Hat." +msgid "There was a problem uploading your report to CentOS support." +msgstr "Υπήρξε ένα πρόβλημα κατα το upload της αναφοράς σας στην CentOS." #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" -msgstr "Η αναφορά σας στάλθηκε επιτυχώς στο ftp server της Red Hat με όνομα:" +msgstr "Η αναφορά σας στάλθηκε επιτυχώς στο ftp server της CentOS με όνομα:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -136,10 +136,10 @@ msgid "" "No changes will be made to your system.\n" "\n" msgstr "" -"Αυτό το εργαλείο θα συγκετρώσει ορισμένες πληροφορίες για τον υπολογιστή σας και την εγκατάσταση του Red Hat Enterprise Linux συστήματος.\n" +"Αυτό το εργαλείο θα συγκετρώσει ορισμένες πληροφορίες για τον υπολογιστή σας και την εγκατάσταση του CentOS Enterprise Linux συστήματος.\n" "Οι πληροφορίες συγκετρώνονται και το archive δημιουργήται στο\n" "/tmp,το οποίο και μπορείτε να στείλετε σε έναν αντιπρόσωπο υποστήριξης.\n" -"Η Red Hat θα χρησιμοποιήσει αυτα τα δεδομένα ΜΟΝΟ για διαγνωστικούς σκοπούς\n" +"Η CentOS θα χρησιμοποιήσει αυτα τα δεδομένα ΜΟΝΟ για διαγνωστικούς σκοπούς\n" "και θα παραμείνουν εμπιστευτηκά.\n" "\n" diff -uNrp sos-2.2.orig/po/en_GB.po sos-2.2/po/en_GB.po --- sos-2.2.orig/po/en_GB.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/en_GB.po 2014-10-15 14:03:18.834823775 +0000 @@ -63,14 +63,14 @@ msgid "Cannot upload to specified URL." msgstr "Cannot upload to specified URL." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." +msgstr "There was a problem uploading your report to CentOS support." #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" msgstr "" -"Your report was successfully uploaded to Red Hat's ftp server with name:" +"Your report was successfully uploaded to CentOS's ftp server with name:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -142,10 +142,10 @@ msgid "" "\n" msgstr "" "This utility will collect some detailed information about the\n" -"hardware and setup of your Red Hat Enterprise Linux system.\n" +"hardware and setup of your CentOS Enterprise Linux system.\n" "The information is collected and an archive is packaged under\n" "/tmp, which you can send to a support representative.\n" -"Red Hat will use this information for diagnostic purposes ONLY\n" +"CentOS will use this information for diagnostic purposes ONLY\n" "and it will be considered confidential information.\n" "\n" "This process may take a while to complete.\n" diff -uNrp sos-2.2.orig/po/en.po sos-2.2/po/en.po --- sos-2.2.orig/po/en.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/en.po 2014-10-15 14:03:18.834823775 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/es.po sos-2.2/po/es.po --- sos-2.2.orig/po/es.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/es.po 2014-10-15 14:03:18.835823774 +0000 @@ -71,9 +71,9 @@ msgid "Cannot upload to specified URL." msgstr "No se puede cargar a la URL especificada." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" -"Hubo un problema al cargar su reporte al equipo de asistencia de Red Hat" +"Hubo un problema al cargar su reporte al equipo de asistencia de CentOS" #: ../sos/policyredhat.py:399 #, python-format diff -uNrp sos-2.2.orig/po/et.po sos-2.2/po/et.po --- sos-2.2.orig/po/et.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/et.po 2014-10-15 14:03:18.835823774 +0000 @@ -61,7 +61,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/eu_ES.po sos-2.2/po/eu_ES.po --- sos-2.2.orig/po/eu_ES.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/eu_ES.po 2014-10-15 14:03:18.835823774 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/fa.po sos-2.2/po/fa.po --- sos-2.2.orig/po/fa.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/fa.po 2014-10-15 14:03:18.835823774 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/fi.po sos-2.2/po/fi.po --- sos-2.2.orig/po/fi.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/fi.po 2014-10-15 14:03:18.836823773 +0000 @@ -61,8 +61,8 @@ msgid "Cannot upload to specified URL." msgstr "Annettuun osoitteeseen ei voida lähettää." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Raportin lähettämisessä Red Hatin käyttötukeen oli ongelmia." +msgid "There was a problem uploading your report to CentOS support." +msgstr "Raportin lähettämisessä CentOSin käyttötukeen oli ongelmia." #: ../sos/policyredhat.py:399 #, python-format diff -uNrp sos-2.2.orig/po/fr.po sos-2.2/po/fr.po --- sos-2.2.orig/po/fr.po 2010-05-04 20:32:04.000000000 +0000 +++ sos-2.2/po/fr.po 2014-10-15 14:03:18.836823773 +0000 @@ -63,8 +63,8 @@ msgid "Cannot upload to specified URL." msgstr "Impossible de le télécharger vers l'URL spécifié." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Une erreur s'est produite lors du téléchargement de votre rapport vers le support Red Hat." +msgid "There was a problem uploading your report to CentOS support." +msgstr "Une erreur s'est produite lors du téléchargement de votre rapport vers le support CentOS." #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." diff -uNrp sos-2.2.orig/po/gl.po sos-2.2/po/gl.po --- sos-2.2.orig/po/gl.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/gl.po 2014-10-15 14:03:18.836823773 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/gu.po sos-2.2/po/gu.po --- sos-2.2.orig/po/gu.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/gu.po 2014-10-15 14:03:18.837823771 +0000 @@ -67,13 +67,13 @@ msgid "Cannot upload to specified URL." msgstr "સ્પષ્ટ કરેલ URL અપલોડ કરી શકતા નથી." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "તમારા અહેવાલને Red Hat આધારમાં અપલોડ કરવામાં સમસ્યા હતી." +msgid "There was a problem uploading your report to CentOS support." +msgstr "તમારા અહેવાલને CentOS આધારમાં અપલોડ કરવામાં સમસ્યા હતી." #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" -msgstr "તમારો અહેવાલ Red Hat ના ftp સર્વરમાં આ નામ સાથે સફળતાપૂર્વક અપલોડ થયો હતો:" +msgstr "તમારો અહેવાલ CentOS ના ftp સર્વરમાં આ નામ સાથે સફળતાપૂર્વક અપલોડ થયો હતો:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -145,10 +145,10 @@ msgid "" "\n" msgstr "" "આ ઉપયોગીતા હાર્ડવેર વિશે અમુક વિગતવાર જાણકારી\n" -"ભેગી કરશે અને તમારી Red Hat Enterprise Linux સિસ્ટમ સુયોજીત કરશે.\n" +"ભેગી કરશે અને તમારી CentOS Enterprise Linux સિસ્ટમ સુયોજીત કરશે.\n" "જાણકારી ભેગી થયેલ છે અને પેટી એ /tmp ડિરેક્ટરી હેઠળ પેકેજ\n" "થયેલ છે, કે જેને તમે આધાર રજૂઆતકને મોકલી શકો છો.\n" -"Red Hat આ જાણકારીનો માત્ર તપાસ હેતુઓ માટે જ ઉપયોગ કરશે\n" +"CentOS આ જાણકારીનો માત્ર તપાસ હેતુઓ માટે જ ઉપયોગ કરશે\n" "અને તે ખાનગી જાણકારી તરીકે ધ્યાનમાં લેવામાં આવશે.\n" "\n" "આ પ્રક્રિયા સમાપ્ત થવા માટે થોડો સમય લેશે.\n" diff -uNrp sos-2.2.orig/po/he.po sos-2.2/po/he.po --- sos-2.2.orig/po/he.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/he.po 2014-10-15 14:03:18.837823771 +0000 @@ -61,7 +61,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/hi.po sos-2.2/po/hi.po --- sos-2.2.orig/po/hi.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/hi.po 2014-10-15 14:03:18.837823771 +0000 @@ -68,13 +68,13 @@ msgid "Cannot upload to specified URL." msgstr "निर्दिष्ट URL अपलोड नहीं कर सकता है." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "आपके रिपोर्ट को Red Hat समर्थन में अपलोड करने में समस्या थी." +msgid "There was a problem uploading your report to CentOS support." +msgstr "आपके रिपोर्ट को CentOS समर्थन में अपलोड करने में समस्या थी." #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" -msgstr "आपका रिपोर्ट Red Hat के ftp सर्वर में नाम के साथ सफलतापूर्वक अपलोड किया गया:" +msgstr "आपका रिपोर्ट CentOS के ftp सर्वर में नाम के साथ सफलतापूर्वक अपलोड किया गया:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -146,10 +146,10 @@ msgid "" "\n" msgstr "" "यह उपयोगिता कुछ विस्तृत सूचना को जमा करेगा\n" -"हार्डवेयर और आपके Red Hat Enterprise Linux सिस्टम के बारे में.\n" +"हार्डवेयर और आपके CentOS Enterprise Linux सिस्टम के बारे में.\n" "सूचना जमा की जाती है और एक अभिलेख को पैकेज किया जाता है\n" "/tmp के अंदर, जिसे आप समर्थन प्रतिनिधि के पास भेज सकते हैं.\n" -"Red Hat इस सूचना को निदानार्थ सिर्फ प्रयोग करेगा\n" +"CentOS इस सूचना को निदानार्थ सिर्फ प्रयोग करेगा\n" "और इसे गोपनीय सूचना माना जायेगा.\n" "\n" "यह प्रक्रिया पूरा करने के लिए कुछ समय लेगा.\n" diff -uNrp sos-2.2.orig/po/hr.po sos-2.2/po/hr.po --- sos-2.2.orig/po/hr.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/hr.po 2014-10-15 14:03:18.838823770 +0000 @@ -62,7 +62,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/hu.po sos-2.2/po/hu.po --- sos-2.2.orig/po/hu.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/hu.po 2014-10-15 14:03:18.838823770 +0000 @@ -62,8 +62,8 @@ msgid "Cannot upload to specified URL." msgstr "Nem lehet az URL-re feltölteni." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "A jelentést a Red Hat támogatáshoz feltöltvén baj történt." +msgid "There was a problem uploading your report to CentOS support." +msgstr "A jelentést a CentOS támogatáshoz feltöltvén baj történt." #: ../sos/policyredhat.py:399 #, python-format diff -uNrp sos-2.2.orig/po/hy.po sos-2.2/po/hy.po --- sos-2.2.orig/po/hy.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/hy.po 2014-10-15 14:03:18.838823770 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/id.po sos-2.2/po/id.po --- sos-2.2.orig/po/id.po 2010-05-28 17:57:28.000000000 +0000 +++ sos-2.2/po/id.po 2014-10-15 14:03:18.839823768 +0000 @@ -28,7 +28,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/ilo.po sos-2.2/po/ilo.po --- sos-2.2.orig/po/ilo.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/ilo.po 2014-10-15 14:03:18.839823768 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/is.po sos-2.2/po/is.po --- sos-2.2.orig/po/is.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/is.po 2014-10-15 14:03:18.839823768 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/it.po sos-2.2/po/it.po --- sos-2.2.orig/po/it.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/it.po 2014-10-15 14:03:18.839823768 +0000 @@ -63,7 +63,7 @@ msgid "Cannot upload to specified URL." msgstr "Impossibile inviare all'URL specificato." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" "Si è verificato un problema nell'inviare il report al supporto tecnico Red " "Hat." diff -uNrp sos-2.2.orig/po/ja.po sos-2.2/po/ja.po --- sos-2.2.orig/po/ja.po 2010-05-31 06:21:36.000000000 +0000 +++ sos-2.2/po/ja.po 2014-10-15 14:03:18.840823767 +0000 @@ -67,8 +67,8 @@ msgid "Cannot upload to specified URL." msgstr "指定された URL にアップロードできません。" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "レポートを Red Hat サポートにアップロードするのに問題がありました。" +msgid "There was a problem uploading your report to CentOS support." +msgstr "レポートを CentOS サポートにアップロードするのに問題がありました。" #: ../sos/policyredhat.py:399 #, python-format diff -uNrp sos-2.2.orig/po/ka.po sos-2.2/po/ka.po --- sos-2.2.orig/po/ka.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/ka.po 2014-10-15 14:03:18.840823767 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/kn.po sos-2.2/po/kn.po --- sos-2.2.orig/po/kn.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/kn.po 2014-10-15 14:03:18.840823767 +0000 @@ -66,15 +66,15 @@ msgid "Cannot upload to specified URL." msgstr "ಸೂಚಿಸಲಾದ URL ಅನ್ನು ಅಪ್‌ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" -"ನಿಮ್ಮ ವರದಿಯನ್ನು Red Hat ಬೆಂಬಲದ ಸ್ಥಳಕ್ಕೆ ಅಪ್‌ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ಒಂದು ತೊಂದರೆ ಉಂಟಾಗಿದೆ." +"ನಿಮ್ಮ ವರದಿಯನ್ನು CentOS ಬೆಂಬಲದ ಸ್ಥಳಕ್ಕೆ ಅಪ್‌ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ಒಂದು ತೊಂದರೆ ಉಂಟಾಗಿದೆ." #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" msgstr "" -"ನಿಮ್ಮ ವರದಿಯನ್ನು ಈ ಹೆಸರಿನೊಂದಿಗೆ Red Hat ನ ftp ಪರಿಚಾರಕಕ್ಕೆ ಯಶಸ್ವಿಯಾಗಿ ಅಪ್‌ಲೋಡ್ " +"ನಿಮ್ಮ ವರದಿಯನ್ನು ಈ ಹೆಸರಿನೊಂದಿಗೆ CentOS ನ ftp ಪರಿಚಾರಕಕ್ಕೆ ಯಶಸ್ವಿಯಾಗಿ ಅಪ್‌ಲೋಡ್ " "ಮಾಡಲಾಗಿದೆ:" #: ../sos/policyredhat.py:402 @@ -147,10 +147,10 @@ msgid "" "\n" msgstr "" "ಈ ಸವಲತ್ತು ನಿಮ್ಮಲ್ಲಿರುವ ಗಣಕದ ಯಂತ್ರಾಂಶದ ಬಗೆಗಿನ ವಿಸ್ತಾರವಾದ ಕೆಲವು ಮಾಹಿತಿಯನ್ನು\n" -"ಸಂಗ್ರಹಿಸಿ ನಂತರ ನಿಮ್ಮ Red Hat Enterprise Linux ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಪಡಿಸುತ್ತದೆ.\n" +"ಸಂಗ್ರಹಿಸಿ ನಂತರ ನಿಮ್ಮ CentOS Enterprise Linux ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಪಡಿಸುತ್ತದೆ.\n" "ಮಾಹಿತಿಯನ್ನು ಸಂಗ್ರಹಿಸಿದ ನಂತರ ಅದನ್ನು ಆರ್ಕೈವ್ ಮಾಡಿ \n" "/tmp ಯಲ್ಲಿ ಉಳಿಸಲಾಗುತ್ತದೆ, ಹಾಗು ಇದನ್ನು ಬೆಂಬಲ ಪ್ರತಿನಿಧಿಗೆ ಕಳುಹಿಸಬಹುದು.\n" -"Red Hat ಇದನ್ನು ಕೇವಲ ದೋಷ ಪತ್ತೆ ಹಚ್ಚಲು ಮಾತ್ರವೆ ಬಳಸಲಾಗುತ್ತದೆ\n" +"CentOS ಇದನ್ನು ಕೇವಲ ದೋಷ ಪತ್ತೆ ಹಚ್ಚಲು ಮಾತ್ರವೆ ಬಳಸಲಾಗುತ್ತದೆ\n" "ಹಾಗು ಇದನ್ನು ಗೌಪ್ಯವಾದ ಮಾಹಿತಿ ಎಂದು ಪರಿಗಣಿಸಲಾಗುತ್ತದೆ.\n" "\n" "ಈ ಪ್ರಕ್ರಿಯೆಯು ಮುಗಿಯಲು ಒಂದಿಷ್ಟು ಸಮಯ ತೆಗೆದು ಕೊಳ್ಳುತ್ತದೆ.\n" diff -uNrp sos-2.2.orig/po/ko.po sos-2.2/po/ko.po --- sos-2.2.orig/po/ko.po 2010-05-02 12:05:56.000000000 +0000 +++ sos-2.2/po/ko.po 2014-10-15 14:03:18.841823766 +0000 @@ -61,8 +61,8 @@ msgid "Cannot upload to specified URL." msgstr "지정된 URL에서 업로드할 수 없습니다." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "리포트를 Red Hat 지원 센터로 업로드하는 데 문제가 발생했습니다." +msgid "There was a problem uploading your report to CentOS support." +msgstr "리포트를 CentOS 지원 센터로 업로드하는 데 문제가 발생했습니다." #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -174,10 +174,10 @@ msgid "" "No changes will be made to your system.\n" "\n" msgstr "" -"이 유틸리티는 Red Hat Enterprise Linux 시스템의 하드웨어와 \n" +"이 유틸리티는 CentOS Enterprise Linux 시스템의 하드웨어와 \n" "시스템 설정 사항에 대한 상세 정보를 수집하게 됩니다. 수집된 \n" "정보는 지원 담당자에게 보낼 수 있도록 /tmp 디렉토리 안에 \n" -"아카이브로 저장됩니다. Red Hat은 이 정보를 문제 해결 목적으로만 사용하며 기밀 정보로 \n" +"아카이브로 저장됩니다. CentOS은 이 정보를 문제 해결 목적으로만 사용하며 기밀 정보로 \n" "취급할 것입니다. \n" "\n" "이 과정을 모두 완료하는 데 약간의 시간이 소요될 수 있으며, \n" diff -uNrp sos-2.2.orig/po/ku.po sos-2.2/po/ku.po --- sos-2.2.orig/po/ku.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/ku.po 2014-10-15 14:03:18.841823766 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/lo.po sos-2.2/po/lo.po --- sos-2.2.orig/po/lo.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/lo.po 2014-10-15 14:03:18.841823766 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/lt.po sos-2.2/po/lt.po --- sos-2.2.orig/po/lt.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/lt.po 2014-10-15 14:03:18.841823766 +0000 @@ -62,7 +62,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/lv.po sos-2.2/po/lv.po --- sos-2.2.orig/po/lv.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/lv.po 2014-10-15 14:03:18.842823764 +0000 @@ -62,7 +62,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/mk.po sos-2.2/po/mk.po --- sos-2.2.orig/po/mk.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/mk.po 2014-10-15 14:03:18.842823764 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/ml.po sos-2.2/po/ml.po --- sos-2.2.orig/po/ml.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/ml.po 2014-10-15 14:03:18.842823764 +0000 @@ -65,14 +65,14 @@ msgid "Cannot upload to specified URL." msgstr "നല്‍കിയിരിക്കുന്ന URL-ലേക്ക് ഫയല്‍ അപ്ലോഡ് ചെയ്യുവാന്‍ സാധ്യമായില്ല " #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Red Hat-ലേക്ക് നിങ്ങളുടെ റിപ്പോറ്‍ട്ട് അയയ്ക്കുന്നതില്‍ ഏതോ പ്റശ്നം ഉണ്ടായിരിക്കുന്നു." +msgid "There was a problem uploading your report to CentOS support." +msgstr "CentOS-ലേക്ക് നിങ്ങളുടെ റിപ്പോറ്‍ട്ട് അയയ്ക്കുന്നതില്‍ ഏതോ പ്റശ്നം ഉണ്ടായിരിക്കുന്നു." #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" msgstr "" -"താഴെ പറഞ്ഞിരിക്കുന്ന പേരില്‍ നിങ്ങളുടെ റിപ്പോറ്‍ട്ട് Red Hat-ന്റെ ftp സറ്‍വറില്‍ സൂക്ഷിച്ചിരിക്കുന്നു:" +"താഴെ പറഞ്ഞിരിക്കുന്ന പേരില്‍ നിങ്ങളുടെ റിപ്പോറ്‍ട്ട് CentOS-ന്റെ ftp സറ്‍വറില്‍ സൂക്ഷിച്ചിരിക്കുന്നു:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -143,11 +143,11 @@ msgid "" "No changes will be made to your system.\n" "\n" msgstr "" -"ഈ പ്റയോഗം നിങ്ങളുടെ Red Hat Enterprise Linux സിസ്റ്റവും ഹാറ്‍ഡ്‌വെയറും\n" +"ഈ പ്റയോഗം നിങ്ങളുടെ CentOS Enterprise Linux സിസ്റ്റവും ഹാറ്‍ഡ്‌വെയറും\n" "സംബന്ധിച്ചുള്ള വിശദ വിവരങ്ങള്‍ ശേഖരിക്കുന്നു.ശേഖരിച്ച വിവരങ്ങള്‍\n" "ഒരു ആറ്‍ക്കൈവ് ആയി /tmp എന്ന ഫോള്‍ഡറില്‍ സൂക്ഷിക്കുന്നു. നിങ്ങള്‍ക്കിത്\n" "പിന്തുണ ലഭ്യമാക്കുന്നവറ്‍ക്ക് അയയ്ക്കുവാന്‍ സാധിക്കുന്നു. പ്റശ്നങ്ങള്‍ അറിയുന്നതിനും\n" -"പരിഹരിക്കുന്നതിനും മാത്റം Red Hat ഈ വിവരങ്ങള്‍ ഉപയോഗിക്കുന്നതാകുന്നു.\n" +"പരിഹരിക്കുന്നതിനും മാത്റം CentOS ഈ വിവരങ്ങള്‍ ഉപയോഗിക്കുന്നതാകുന്നു.\n" "ഇവ അതീവ രഹസ്യമായി സൂക്ഷിക്കപ്പെടുന്നു.\n" "\n" "ഈ പ്റക്റിയയ്ക്കായി കുറച്ച് സമയമെടുക്കുന്നു.\n" diff -uNrp sos-2.2.orig/po/mr.po sos-2.2/po/mr.po --- sos-2.2.orig/po/mr.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/mr.po 2014-10-15 14:03:18.843823763 +0000 @@ -66,13 +66,13 @@ msgid "Cannot upload to specified URL." msgstr "निर्देशीत URL अपलोड करण्यास अशक्य." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "तुमचा अहवाल Red Hat सपोर्टकडे पाठवतेवेळी अडचण आढळली." +msgid "There was a problem uploading your report to CentOS support." +msgstr "तुमचा अहवाल CentOS सपोर्टकडे पाठवतेवेळी अडचण आढळली." #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" -msgstr "तुमचा अहवाल यशस्वीरित्या नावासह Red Hat च्या ftp सर्व्हरवर अपलोड केले:" +msgstr "तुमचा अहवाल यशस्वीरित्या नावासह CentOS च्या ftp सर्व्हरवर अपलोड केले:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -144,10 +144,10 @@ msgid "" "\n" msgstr "" "ही युटीलीटी हार्डवेअर विषयी काहिक तपशील माहिती\n" -"गोळा करते व तुमची Red Hat Enterprise Linux प्रणली सेटअप करते.\n" +"गोळा करते व तुमची CentOS Enterprise Linux प्रणली सेटअप करते.\n" "माहिती गोळा केली जाते व एक आर्काइव्ह\n" "/tmp अंतर्गत पॅकेज्ड् केले जाते, जे तुम्ही सपोर्ट प्रतिनीधीकडे पाठवू शकता.\n" -"Red Hat या माहितीचा वापर फक्त विश्लेषण कारणास्तवच करेल\n" +"CentOS या माहितीचा वापर फक्त विश्लेषण कारणास्तवच करेल\n" "व त्यांस गोपणीय म्हणून ठरवते.\n" "\n" "हे कार्य पूर्ण व्हायला काहिक वेळ जरूर लागेल.\n" diff -uNrp sos-2.2.orig/po/ms.po sos-2.2/po/ms.po --- sos-2.2.orig/po/ms.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/ms.po 2014-10-15 14:03:18.843823763 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/my.po sos-2.2/po/my.po --- sos-2.2.orig/po/my.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/my.po 2014-10-15 14:03:18.843823763 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/nb.po sos-2.2/po/nb.po --- sos-2.2.orig/po/nb.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/nb.po 2014-10-15 14:03:18.844823761 +0000 @@ -61,7 +61,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/nl.po sos-2.2/po/nl.po --- sos-2.2.orig/po/nl.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/nl.po 2014-10-15 14:03:18.844823761 +0000 @@ -64,9 +64,9 @@ msgid "Cannot upload to specified URL." msgstr "Kan niet naar de opgegeven URL uploaden." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" -"Er trad een probleem op bij het uploaden van jouw melding naar Red Hat " +"Er trad een probleem op bij het uploaden van jouw melding naar CentOS " "support." #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/nn.po sos-2.2/po/nn.po --- sos-2.2.orig/po/nn.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/nn.po 2014-10-15 14:03:18.844823761 +0000 @@ -61,7 +61,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/nso.po sos-2.2/po/nso.po --- sos-2.2.orig/po/nso.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/nso.po 2014-10-15 14:03:18.845823760 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/or.po sos-2.2/po/or.po --- sos-2.2.orig/po/or.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/or.po 2014-10-15 14:03:18.845823760 +0000 @@ -70,13 +70,13 @@ msgid "Cannot upload to specified URL." msgstr "ଉଲ୍ଲିଖିତ URL କୁ ଧାରଣ କରିପାରିବେ ନାହିଁ।" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Red Hat ସହାୟତାରେ ଆପଣଙ୍କର ବିବରଣୀକୁ ଧାରଣ କରିବାରେ ସମସ୍ୟା ଦୋଇଥିଲା।" +msgid "There was a problem uploading your report to CentOS support." +msgstr "CentOS ସହାୟତାରେ ଆପଣଙ୍କର ବିବରଣୀକୁ ଧାରଣ କରିବାରେ ସମସ୍ୟା ଦୋଇଥିଲା।" #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" -msgstr "ଆପଣଙ୍କର ବିବରଣୀ Red Hat's ftp ସର୍ଭରରେ ନିମ୍ନଲିଖିତ ନାମରେ ସଫଳତାର ସହିତ ଧାରଣ ହୋଇଛି:" +msgstr "ଆପଣଙ୍କର ବିବରଣୀ CentOS's ftp ସର୍ଭରରେ ନିମ୍ନଲିଖିତ ନାମରେ ସଫଳତାର ସହିତ ଧାରଣ ହୋଇଛି:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -148,10 +148,10 @@ msgid "" "\n" msgstr "" "ଏହି ଉପଯୋଗିତାଟି ହାର୍ଡୱେର ବିଷୟରେ କିଛି ବିସ୍ତୃତ ସୂଚନା ସଂଗ୍ରହ ସଂଗ୍ରହ କରିଥାଏ\n" -"ଏବଂ ଆପଣଙ୍କର Red Hat Enterprise Linux ତନ୍ତ୍ରକୁ ବିନ୍ୟାସ କରିଥାଏ।\n" +"ଏବଂ ଆପଣଙ୍କର CentOS Enterprise Linux ତନ୍ତ୍ରକୁ ବିନ୍ୟାସ କରିଥାଏ।\n" "ସୂଚନା ସଂଗ୍ରହ କରାଯାଇଥାଏ ଏବଂ ଅଭିଲେଖକୁ /tmp ଅନ୍ତର୍ଗତରେ ପ୍ୟାକେଜ ହୋଇଥାଏ\n" ", ଯାହାକୁକି ଆପଣ ଜଣେ ସହାୟକ ପ୍ରତିନିଧିଙ୍କ ପାଖକୁ ପଠାଇପାରିବେ।\n" -"Red Hat ଏହି ସୂଚନାକୁ କେବଳ ନିରୂପଣ କରିବା ଉଦ୍ଦେଶ୍ୟରେ ବ୍ୟବହାର କରିଥାଏ\n" +"CentOS ଏହି ସୂଚନାକୁ କେବଳ ନିରୂପଣ କରିବା ଉଦ୍ଦେଶ୍ୟରେ ବ୍ୟବହାର କରିଥାଏ\n" "ଏବଂ ଏହାକୁ ଗୁପ୍ତ ସୂଚନା ଭାବରେ ଗ୍ରହଣ କରାଯାଇଥାଏ।\n" "\n" "ଏହି ପଦ୍ଧତି ସମ୍ପୂର୍ଣ୍ଣ ହେବା ପାଇଁ କିଛି ସମୟ ନେଇପାରେ।\n" diff -uNrp sos-2.2.orig/po/pa.po sos-2.2/po/pa.po --- sos-2.2.orig/po/pa.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/pa.po 2014-10-15 14:03:18.845823760 +0000 @@ -65,13 +65,13 @@ msgid "Cannot upload to specified URL." msgstr "ਦਿੱਤੇ URL ਤੇ ਅੱਪਲੋਡ ਨਹੀਂ ਕਰ ਸਕਦਾ।" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "ਤੁਹਾਡੀ ਰਿਪੋਰਟ ਨੂੰ Red Hat ਸਹਿਯੋਗ ਤੇ ਅੱਪਲੋਡ ਕਰਨ ਵੇਲੇ ਗਲਤੀ ਆਈ ਹੈ।" +msgid "There was a problem uploading your report to CentOS support." +msgstr "ਤੁਹਾਡੀ ਰਿਪੋਰਟ ਨੂੰ CentOS ਸਹਿਯੋਗ ਤੇ ਅੱਪਲੋਡ ਕਰਨ ਵੇਲੇ ਗਲਤੀ ਆਈ ਹੈ।" #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" -msgstr "ਤੁਹਾਡੀ ਰਿਪੋਰਟ ਸਫਲਤਾਪੂਰਕ Red Hat ਦੇ ftp ਸਰਵਰ ਤੇ ਇਸ ਨਾਂ ਨਾਲ ਅੱਪਲੋਡ ਹੋ ਗਈ ਹੈ:" +msgstr "ਤੁਹਾਡੀ ਰਿਪੋਰਟ ਸਫਲਤਾਪੂਰਕ CentOS ਦੇ ftp ਸਰਵਰ ਤੇ ਇਸ ਨਾਂ ਨਾਲ ਅੱਪਲੋਡ ਹੋ ਗਈ ਹੈ:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -143,10 +143,10 @@ msgid "" "\n" msgstr "" "ਇਹ ਸਹੂਲਤ ਹਾਰਡਵੇਅਰ ਬਾਰੇ ਕੁਝ ਵਿਸਥਾਰ ਜਾਣਕਾਰੀ ਇਕੱਠੀ\n" -"ਕਰੇਗੀ ਅਤੇ ਤੁਹਾਡੇ Red Hat Enterprise Linux ਸਿਸਟਮ ਨੂੰ ਨਿਰਧਾਰਤ ਕਰੇਗੀ।\n" +"ਕਰੇਗੀ ਅਤੇ ਤੁਹਾਡੇ CentOS Enterprise Linux ਸਿਸਟਮ ਨੂੰ ਨਿਰਧਾਰਤ ਕਰੇਗੀ।\n" "ਜਾਣਕਾਰੀ ਇਕੱਠੀ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਅਤੇ /tmp ਵਿੱਚ ਇੱਕ ਆਰਚੀਵ ਬਣਾਈ ਜਾਂਦੀ\n" "ਹੈ, ਜੋ ਤੁਸੀਂ ਸਹਿਯੋਗ ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਭੇਜ ਸਕਦੇ ਹੋ।\n" -"Red Hat ਇਸ ਜਾਣਕਾਰੀ ਨੂੰ ਸਿਰਫ ਹੱਲ ਕਰਨ ਲਈ ਵਰਤੇਗਾ\n" +"CentOS ਇਸ ਜਾਣਕਾਰੀ ਨੂੰ ਸਿਰਫ ਹੱਲ ਕਰਨ ਲਈ ਵਰਤੇਗਾ\n" "ਅਤੇ ਇਹ ਜਾਣਕਾਰੀ ਗੁਪਤ ਰੱਖੀ ਜਾਏਗੀ।\n" "\n" "ਇਹ ਕਾਰਜ ਮੁਕੰਮਲ ਹੋਣ ਲਈ ਕੁਝ ਸਮਾਂ ਲੈ ਸਕਦਾ ਹੈ।\n" diff -uNrp sos-2.2.orig/po/pl.po sos-2.2/po/pl.po --- sos-2.2.orig/po/pl.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/pl.po 2014-10-15 14:03:18.846823758 +0000 @@ -60,10 +60,10 @@ msgid "Cannot upload to specified URL." msgstr "Nie można wysłać na podany adres URL." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" "Wystąpił problem podczas wysyłania raportu do wsparcia technicznego firmy " -"Red Hat." +"CentOS." #: ../sos/policyredhat.py:399 #, python-format diff -uNrp sos-2.2.orig/po/pt_BR.po sos-2.2/po/pt_BR.po --- sos-2.2.orig/po/pt_BR.po 2010-04-16 12:33:43.000000000 +0000 +++ sos-2.2/po/pt_BR.po 2014-10-15 14:03:18.846823758 +0000 @@ -58,8 +58,8 @@ msgid "Cannot upload to specified URL." msgstr "Não foi possível enviar para a URL especificada." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Houve um problema ao enviar o seu relatório para o suporte da Red Hat." +msgid "There was a problem uploading your report to CentOS support." +msgstr "Houve um problema ao enviar o seu relatório para o suporte da CentOS." #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." diff -uNrp sos-2.2.orig/po/pt.po sos-2.2/po/pt.po --- sos-2.2.orig/po/pt.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/pt.po 2014-10-15 14:03:18.846823758 +0000 @@ -67,8 +67,8 @@ msgid "Cannot upload to specified URL." msgstr "Não foi possível submeter para o URL especificado." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Ocorreu um erro ao submeter o seu relatório para o suporte Red Hat." +msgid "There was a problem uploading your report to CentOS support." +msgstr "Ocorreu um erro ao submeter o seu relatório para o suporte CentOS." #: ../sos/policyredhat.py:399 #, python-format diff -uNrp sos-2.2.orig/po/ro.po sos-2.2/po/ro.po --- sos-2.2.orig/po/ro.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/ro.po 2014-10-15 14:03:18.847823757 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/ru.po sos-2.2/po/ru.po --- sos-2.2.orig/po/ru.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/ru.po 2014-10-15 14:03:18.847823757 +0000 @@ -67,9 +67,9 @@ msgid "Cannot upload to specified URL." msgstr "Не удалось отправить файл." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" -"Произошла ошибка при попытке отправить отчёт в службу поддержки Red Hat." +"Произошла ошибка при попытке отправить отчёт в службу поддержки CentOS." #: ../sos/policyredhat.py:399 #, python-format diff -uNrp sos-2.2.orig/po/si.po sos-2.2/po/si.po --- sos-2.2.orig/po/si.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/si.po 2014-10-15 14:03:18.847823757 +0000 @@ -66,13 +66,13 @@ msgid "Cannot upload to specified URL." msgstr "දක්වන ලඳ URL වෙත ලබා දිය නොහැක." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "ඔබගේ වාර්තාව Red Hat සහය වෙතට ලබා දිමේදි දෝෂයල් ඇති විය." +msgid "There was a problem uploading your report to CentOS support." +msgstr "ඔබගේ වාර්තාව CentOS සහය වෙතට ලබා දිමේදි දෝෂයල් ඇති විය." #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" -msgstr "ඔබගේ වාර්තාව සාර්තකව Red Hat's ftp සේවාදායකයට ලබාදුන් අතර නම වූයේ:" +msgstr "ඔබගේ වාර්තාව සාර්තකව CentOS's ftp සේවාදායකයට ලබාදුන් අතර නම වූයේ:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -143,11 +143,11 @@ msgid "" "No changes will be made to your system.\n" "\n" msgstr "" -"මෙම උපයෝගි තාවය දෘඩාංග පිළිබදව සවිස්තරාත්මක තොරතුරු රැස්කරණ අතර ඔබගේ Red Hat " +"මෙම උපයෝගි තාවය දෘඩාංග පිළිබදව සවිස්තරාත්මක තොරතුරු රැස්කරණ අතර ඔබගේ CentOS " "Enterprise Linux පද්ධතිය පිහිටවනු ලැබේ.\n" "රැස් කළ තොරතුරු සහ සංරක්‍ෂකය /tmp යටතේ ඇසුරුම් ගත කර ඇති අතර ඔබට එය සහායක නියෝජිත වෙත " "යැවිය හැක.\n" -"Red Hat මෙම තොරතුරු භාවිතා කරන්නේ දෝෂ විනිශ්චය පමණක් වන අතර එම තොරතුරු රහසිගත තොරතුරු " +"CentOS මෙම තොරතුරු භාවිතා කරන්නේ දෝෂ විනිශ්චය පමණක් වන අතර එම තොරතුරු රහසිගත තොරතුරු " "ලෙස සළකණු ලබයි.\n" "\n" "මෙම ක්‍රියාව නිම වීමට වේලාවක් ගතවනු ඇත.\n" diff -uNrp sos-2.2.orig/po/sk.po sos-2.2/po/sk.po --- sos-2.2.orig/po/sk.po 2010-04-16 12:06:48.000000000 +0000 +++ sos-2.2/po/sk.po 2014-10-15 14:03:18.848823756 +0000 @@ -64,8 +64,8 @@ msgid "Cannot upload to specified URL." msgstr "Nie je možné odoslať na zadanú adresu URL." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Nastal problém pri odosielaní vašej správy na podporu Red Hat." +msgid "There was a problem uploading your report to CentOS support." +msgstr "Nastal problém pri odosielaní vašej správy na podporu CentOS." #: ../sos/policyredhat.py:399 #, python-format diff -uNrp sos-2.2.orig/po/sl.po sos-2.2/po/sl.po --- sos-2.2.orig/po/sl.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/sl.po 2014-10-15 14:03:18.848823756 +0000 @@ -62,7 +62,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/sos.pot sos-2.2/po/sos.pot --- sos-2.2.orig/po/sos.pot 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/sos.pot 2014-10-15 14:03:18.848823756 +0000 @@ -61,7 +61,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/sq.po sos-2.2/po/sq.po --- sos-2.2.orig/po/sq.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/sq.po 2014-10-15 14:03:18.849823754 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/sr@latin.po sos-2.2/po/sr@latin.po --- sos-2.2.orig/po/sr@latin.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/sr@latin.po 2014-10-15 14:03:18.849823754 +0000 @@ -64,8 +64,8 @@ msgid "Cannot upload to specified URL." msgstr "Ne mogu da pošaljem na navedeni URL." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Pojavio se problem pri slanju vašeg izveštaja Red Hat podršci." +msgid "There was a problem uploading your report to CentOS support." +msgstr "Pojavio se problem pri slanju vašeg izveštaja CentOS podršci." #: ../sos/policyredhat.py:399 #, python-format diff -uNrp sos-2.2.orig/po/sr.po sos-2.2/po/sr.po --- sos-2.2.orig/po/sr.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/sr.po 2014-10-15 14:03:18.849823754 +0000 @@ -1,5 +1,5 @@ # Serbian translations for sos -# Copyright (C) 2007 Red Hat, Inc. +# Copyright (C) 2007 CentOS, Inc. # This file is distributed under the same license as the sos package. # Miloš Komarčević , 2009. # @@ -64,8 +64,8 @@ msgid "Cannot upload to specified URL." msgstr "Не могу да пошаљем на наведени УРЛ." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Појавио се проблем при слању вашег извештаја Red Hat подршци." +msgid "There was a problem uploading your report to CentOS support." +msgstr "Појавио се проблем при слању вашег извештаја CentOS подршци." #: ../sos/policyredhat.py:399 #, python-format diff -uNrp sos-2.2.orig/po/sv.po sos-2.2/po/sv.po --- sos-2.2.orig/po/sv.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/sv.po 2014-10-15 14:03:18.849823754 +0000 @@ -66,13 +66,13 @@ msgid "Cannot upload to specified URL." msgstr "Kan inte skicka till angiven URL." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Ett problem uppstod när din rapport skickades till Red Hat support." +msgid "There was a problem uploading your report to CentOS support." +msgstr "Ett problem uppstod när din rapport skickades till CentOS support." #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" -msgstr "Din rapport har skickats till Red Hats ftp-server med namnet:" +msgstr "Din rapport har skickats till CentOSs ftp-server med namnet:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." diff -uNrp sos-2.2.orig/po/ta.po sos-2.2/po/ta.po --- sos-2.2.orig/po/ta.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/ta.po 2014-10-15 14:03:18.850823753 +0000 @@ -64,13 +64,13 @@ msgid "Cannot upload to specified URL." msgstr "குறிப்பிட்ட இணைய முகவரியில் ஏற்ற முடியவில்லை." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "உங்கள் அறிக்கையை Red Hat சேவைக்கு அனுப்புவதில் சிக்கல்." +msgid "There was a problem uploading your report to CentOS support." +msgstr "உங்கள் அறிக்கையை CentOS சேவைக்கு அனுப்புவதில் சிக்கல்." #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" -msgstr "உங்கள் அறிக்கை வெற்றிகரமாக Red Hat ftp சேவையகத்தில் பெயருடன் ஏற்றப்பட்டது:" +msgstr "உங்கள் அறிக்கை வெற்றிகரமாக CentOS ftp சேவையகத்தில் பெயருடன் ஏற்றப்பட்டது:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -141,11 +141,11 @@ msgid "" "No changes will be made to your system.\n" "\n" msgstr "" -"இந்த வசதி வன்பொருள் பற்றியும் மற்றும் உங்கள் Red Hat Enterprise \n" +"இந்த வசதி வன்பொருள் பற்றியும் மற்றும் உங்கள் CentOS Enterprise \n" "Linux கணினியை அமைப்பது பற்றியும் விரிவான தகவலை கொண்டிருக்கும்.\n" "இந்த தகவல்கள் சேகரிக்கப்பட்டு /tmpஇல் தொகுக்கப்படுகிறது,\n" "இதனை நீங்கள் சேவை பிரதிநிதிக்கு அனுப்பலாம்.\n" -"Red Hat இந்த தகவலை ஆராய மட்டுமே பயன்படுத்தி\n" +"CentOS இந்த தகவலை ஆராய மட்டுமே பயன்படுத்தி\n" "இரகசியமாக வைத்து கொள்ளும்.\n" "\n" "இந்தப் பணி முடிய சிறிது நேரம் ஆகும்.\n" diff -uNrp sos-2.2.orig/po/te.po sos-2.2/po/te.po --- sos-2.2.orig/po/te.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/te.po 2014-10-15 14:03:18.850823753 +0000 @@ -67,13 +67,13 @@ msgid "Cannot upload to specified URL." msgstr "తెలుపబడిన URLకు అప్‌లోడ్ చేయలేదు." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "మీ సమస్యను Red Hat మద్దతునకు అప్‌లోడు చేయుటలో వొక సమస్యవుంది." +msgid "There was a problem uploading your report to CentOS support." +msgstr "మీ సమస్యను CentOS మద్దతునకు అప్‌లోడు చేయుటలో వొక సమస్యవుంది." #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" -msgstr "మీ నివేదిక సమర్దవంతంగా Red Hat ftp సేవికకు నామముతో అప్‌లోడ్ చేయబడింది:" +msgstr "మీ నివేదిక సమర్దవంతంగా CentOS ftp సేవికకు నామముతో అప్‌లోడ్ చేయబడింది:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -144,10 +144,10 @@ msgid "" "No changes will be made to your system.\n" "\n" msgstr "" -"మీ Red Hat Enterprise Linux సిస్టమ్ యొక్క హార్డువేరు మరియు అమర్పు గురించిన\n" +"మీ CentOS Enterprise Linux సిస్టమ్ యొక్క హార్డువేరు మరియు అమర్పు గురించిన\n" "కొంత విశదీకృత సమాచారమును ఈ సౌలభ్యము సేకరిస్తుంది. సమాచారము సేకరించబడుతుంది\n" "మరియు ఆర్చివ్ /tmp క్రింద ప్యాకేజీ చేయబడుతుంది, దీనిని మీరు మద్దతు ప్రతినిధికి పంపవచ్చు.\n" -"Red Hat ఈ సమాచారమును విశ్లేషణ ప్రయోజనముల కొరకు మాత్రమే వుపయోగిస్తుంది\n" +"CentOS ఈ సమాచారమును విశ్లేషణ ప్రయోజనముల కొరకు మాత్రమే వుపయోగిస్తుంది\n" "మరియు అది గోప్యంగా వుంచబడుతుంది.\n" "\n" "పూర్తగుటకు ఈ కార్యక్రమము కొంత సమయాన్ని తీసుకొంటుంది.\n" diff -uNrp sos-2.2.orig/po/th.po sos-2.2/po/th.po --- sos-2.2.orig/po/th.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/th.po 2014-10-15 14:03:18.851823751 +0000 @@ -64,13 +64,13 @@ msgid "Cannot upload to specified URL." msgstr "ไม่สามารถอัพโหลดไปยัง URL ที่ระบุ" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "มีปัญหาในการอัพโหลดรายงานของคุณไปยังฝ่ายสนับสนุน Red Hat" +msgid "There was a problem uploading your report to CentOS support." +msgstr "มีปัญหาในการอัพโหลดรายงานของคุณไปยังฝ่ายสนับสนุน CentOS" #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" -msgstr "รายงานของคุณได้ถูกส่งไปยังเซิร์ฟเวอร์ ftp ของ Red Hat ในชื่อ:" +msgstr "รายงานของคุณได้ถูกส่งไปยังเซิร์ฟเวอร์ ftp ของ CentOS ในชื่อ:" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -142,9 +142,9 @@ msgid "" "\n" msgstr "" "เครื่องมือนี้จะเก็บข้อมูลโดยละเอียดเกี่ยวกับฮาร์ดแวร์และการตั้งค่า\n" -"ระบบ Red Hat Enterprise Linux ของคุณ ข้อมูลจะถูกเก็บและ\n" +"ระบบ CentOS Enterprise Linux ของคุณ ข้อมูลจะถูกเก็บและ\n" "สร้างเป็นไฟล์ที่ /tmp ซึ่งคุณสามารถส่งไปยังผู้สนับสนุนได้\n" -"Red Hat จะใช้ข้อมูลนี้ในการแก้ไขปัญหาเท่านั้น และจะถือว่าเป็น\n" +"CentOS จะใช้ข้อมูลนี้ในการแก้ไขปัญหาเท่านั้น และจะถือว่าเป็น\n" "ความลับ\n" "\n" "กระบวนการนี้อาจจะใช้เวลาสักครู่ในการทำงาน จะไม่มีการแก้ไข\n" diff -uNrp sos-2.2.orig/po/tr.po sos-2.2/po/tr.po --- sos-2.2.orig/po/tr.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/tr.po 2014-10-15 14:03:18.851823751 +0000 @@ -61,7 +61,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/uk.po sos-2.2/po/uk.po --- sos-2.2.orig/po/uk.po 2010-04-11 07:03:58.000000000 +0000 +++ sos-2.2/po/uk.po 2014-10-15 14:03:18.851823751 +0000 @@ -65,8 +65,8 @@ msgid "Cannot upload to specified URL." msgstr "Не вдається надіслати файл." #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "Виникла помилка при спробі надіслати звіт до служби підтримки Red Hat." +msgid "There was a problem uploading your report to CentOS support." +msgstr "Виникла помилка при спробі надіслати звіт до служби підтримки CentOS." #: ../sos/policyredhat.py:399 #, python-format diff -uNrp sos-2.2.orig/po/ur.po sos-2.2/po/ur.po --- sos-2.2.orig/po/ur.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/ur.po 2014-10-15 14:03:18.852823750 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/vi.po sos-2.2/po/vi.po --- sos-2.2.orig/po/vi.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/vi.po 2014-10-15 14:03:18.852823750 +0000 @@ -61,7 +61,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/po/zh_CN.po sos-2.2/po/zh_CN.po --- sos-2.2.orig/po/zh_CN.po 2010-05-28 13:38:24.000000000 +0000 +++ sos-2.2/po/zh_CN.po 2014-10-15 14:03:18.852823750 +0000 @@ -62,7 +62,7 @@ msgid "Cannot upload to specified URL." msgstr "无法上传到指定的网址。" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "在将您的报告上传到红帽支持时出错。" #: ../sos/policyredhat.py:402 diff -uNrp sos-2.2.orig/po/zh_TW.po sos-2.2/po/zh_TW.po --- sos-2.2.orig/po/zh_TW.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/zh_TW.po 2014-10-15 14:03:18.853823749 +0000 @@ -66,13 +66,13 @@ msgid "Cannot upload to specified URL." msgstr "無法上傳指定的網址。" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." -msgstr "將報告上傳至 Red Hat 技術支援時，出現問題。" +msgid "There was a problem uploading your report to CentOS support." +msgstr "將報告上傳至 CentOS 技術支援時，出現問題。" #: ../sos/policyredhat.py:399 #, fuzzy, python-format msgid "Your report was successfully uploaded to %s with name:" -msgstr "您的報告已經成功地傳送至 Red Hat 的 FTP 伺服器，名稱為：" +msgstr "您的報告已經成功地傳送至 CentOS 的 FTP 伺服器，名稱為：" #: ../sos/policyredhat.py:402 msgid "Please communicate this name to your support representative." @@ -143,9 +143,9 @@ msgid "" "No changes will be made to your system.\n" "\n" msgstr "" -"這工具程式會蒐集 Red Hat Enterprise Linux 的硬體與設定資訊。\n" +"這工具程式會蒐集 CentOS Enterprise Linux 的硬體與設定資訊。\n" "這些資訊被蒐集後，會以壓縮檔形式備份於 /tmp/ 目錄中，您可以將\n" -"這些訊息傳給技術人員以尋求支持。Red Hat 將這些資訊視為機密，\n" +"這些訊息傳給技術人員以尋求支持。CentOS 將這些資訊視為機密，\n" "「只會」將這些資訊拿來作為診斷問題之用。\n" "\n" "這過程會花上一點時間。\n" diff -uNrp sos-2.2.orig/po/zu.po sos-2.2/po/zu.po --- sos-2.2.orig/po/zu.po 2010-03-31 20:25:51.000000000 +0000 +++ sos-2.2/po/zu.po 2014-10-15 14:03:18.853823749 +0000 @@ -60,7 +60,7 @@ msgid "Cannot upload to specified URL." msgstr "" #: ../sos/policyredhat.py:397 -msgid "There was a problem uploading your report to Red Hat support." +msgid "There was a problem uploading your report to CentOS support." msgstr "" #: ../sos/policyredhat.py:399 diff -uNrp sos-2.2.orig/sos/plugins/hts.py sos-2.2/sos/plugins/hts.py --- sos-2.2.orig/sos/plugins/hts.py 2009-06-09 19:59:26.000000000 +0000 +++ sos-2.2/sos/plugins/hts.py 2014-10-15 14:03:18.853823749 +0000 @@ -15,7 +15,7 @@ import sos.plugintools class hts(sos.plugintools.PluginBase): - """Red Hat Hardware Test Suite related information + """CentOS Hardware Test Suite related information """ def setup(self): self.addCopySpec("/etc/httpd/conf.d/hts.conf") diff -uNrp sos-2.2.orig/sos/plugins/rhui.py sos-2.2/sos/plugins/rhui.py --- sos-2.2.orig/sos/plugins/rhui.py 2014-10-15 13:58:24.758239000 +0000 +++ sos-2.2/sos/plugins/rhui.py 2014-10-15 14:03:18.853823749 +0000 @@ -16,7 +16,7 @@ import sos.plugintools import os class rhui(sos.plugintools.PluginBase): - """Red Hat Update Infrastructure for Cloud Providers + """CentOS Update Infrastructure for Cloud Providers """ rhui_debug_path = "/usr/share/rh-rhua/rhui-debug.py" def checkenabled(self): diff -uNrp sos-2.2.orig/sos/policyredhat.py sos-2.2/sos/policyredhat.py --- sos-2.2.orig/sos/policyredhat.py 2014-10-15 13:58:24.882239000 +0000 +++ sos-2.2/sos/policyredhat.py 2014-10-15 14:03:18.854823747 +0000 @@ -436,7 +436,7 @@ class SosPolicy: ftp.storbinary('STOR %s' % upload_name, fp) ftp.quit() except: - print _("There was a problem uploading your report to Red Hat support.") + print _("There was a problem uploading your report to CentOS support.") else: print _("Your report was successfully uploaded to %s with name:" % (upload_url,)) print " " + upload_name diff -uNrp sos-2.2.orig/sos/policyredhat.py.orig sos-2.2/sos/policyredhat.py.orig --- sos-2.2.orig/sos/policyredhat.py.orig 2014-10-15 13:58:24.878239000 +0000 +++ sos-2.2/sos/policyredhat.py.orig 2014-10-15 14:03:18.689823981 +0000 @@ -205,7 +205,9 @@ class SosPolicy: dstroot = os.path.join(os.path.abspath(tmpdir),uniqname) try: os.makedirs(dstroot, 0700) - except: + except Exception as e: + print "Failed to create temporary directory:" + print e return False return dstroot diff -uNrp sos-2.2.orig/sos/sosreport.py sos-2.2/sos/sosreport.py --- sos-2.2.orig/sos/sosreport.py 2014-10-15 13:58:24.939239000 +0000 +++ sos-2.2/sos/sosreport.py 2014-10-15 14:03:18.855823746 +0000 @@ -56,8 +56,8 @@ if os.path.isfile('/etc/fedora-release') __vendor_url = 'https://fedoraproject.org/' else: - __distro__ = 'Red Hat Enterprise Linux' - __vendor__ = 'Red Hat' + __distro__ = 'CentOS Linux' + __vendor__ = 'CentOS' __vendor_url = 'https://access.redhat.com/support/' class GlobalVars: @@ -171,7 +171,7 @@ def parse_options(opts): help="upload the report to an ftp server") #__cmdParser__.add_option("--encrypt", action="store_true", \ # dest="encrypt", default=False, \ - # help="encrypt with GPG using Red Hat support's public key") + # help="encrypt with GPG using CentOS's public key") __cmdParser__.add_option("--batch", action="store_true", \ dest="batch", default=False, \ help="do not ask any question (batch mode)") diff -uNrp sos-2.2.orig/sos/sosreport.py.orig sos-2.2/sos/sosreport.py.orig --- sos-2.2.orig/sos/sosreport.py.orig 1970-01-01 00:00:00.000000000 +0000 +++ sos-2.2/sos/sosreport.py.orig 2014-10-15 14:03:18.746823900 +0000 @@ -0,0 +1,910 @@ +""" +Gather information about a system and report it using plugins +supplied for application-specific information +""" +## sosreport.py +## gather information about a system and report it + +## Copyright (C) 2006 Steve Conklin + +### This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +# pylint: disable-msg = W0611 +# pylint: disable-msg = W0702 +# pylint: disable-msg = R0912 +# pylint: disable-msg = R0914 +# pylint: disable-msg = R0915 +# pylint: disable-msg = R0913 +# pylint: disable-msg = E0611 +# pylint: disable-msg = E1101 +# pylint: disable-msg = R0904 +# pylint: disable-msg = R0903 + +import sys, traceback +import os +import logging +from optparse import OptionParser, Option +import ConfigParser +import sos.policyredhat +from sos.helpers import importPlugin +import signal +from stat import ST_UID, ST_GID, ST_MODE, ST_CTIME, ST_ATIME, ST_MTIME, S_IMODE +from time import strftime, localtime +from itertools import * +from collections import deque +from textwrap import fill +import errno + +from sos import _sos as _ +from sos import __version__ + +if os.path.isfile('/etc/fedora-release'): + __distro__ = 'Fedora' + __vendor__ = 'The Fedora Project' + __vendor_url = 'https://fedoraproject.org/' + +else: + __distro__ = 'Red Hat Enterprise Linux' + __vendor__ = 'Red Hat' + __vendor_url = 'https://access.redhat.com/support/' + +class GlobalVars: + """ Generic container for shared vars """ + def __init__(self): + pass + +## Set up routines to be linked to signals for termination handling +def exittermhandler(signum, frame): + """ Handle signals cleanly """ + del frame, signum + doExitCode() + +def doExitCode(): + """ Exit with return """ + + for plugname, plug in GlobalVars.loadedplugins: + plug.exit_please() + del plugname + + print "All processes ended, cleaning up." + doExit(1) + +def doExit(error=0): + """ Exit with return """ + # We will attempt to clean dstroot; there is only + # one instance where the policy is not set and that is + # during the actual creation of dstroot + try: + GlobalVars.policy.cleanDstroot() + except AttributeError: + sys.exit(error) + sys.exit(error) + +def doException(etype, eval, etrace): + """ Wrap exception in debugger if not in tty """ + if hasattr(sys, 'ps1') or not sys.stderr.isatty(): + # we are in interactive mode or we don't have a tty-like + # device, so we call the default hook + sys.__excepthook__(etype, eval, etrace) + else: + import traceback, pdb + # we are NOT in interactive mode, print the exception... + traceback.print_exception(etype, eval, etrace, limit=2, file=sys.stdout) + print + # ...then start the debugger in post-mortem mode. + pdb.pm() + +# Handle any sort of exit signal cleanly +# Currently, we intercept only sig 15 (TERM) +signal.signal(signal.SIGTERM, exittermhandler) + +class OptionParserExtended(OptionParser): + """ Show examples """ + def print_help(self, out=sys.stdout): + """ Prints help content including examples """ + OptionParser.print_help(self, out) + print + print "Some examples:" + print + print " enable cluster plugin only and collect dlm lockdumps:" + print " # sosreport -o cluster -k cluster.lockdump" + print + print " disable memory and samba plugins, turn off rpm -Va collection:" + print " # sosreport -n memory,samba -k rpm.rpmva=off" + print + del out + +class SosOption (Option): + """Allow to specify comma delimited list of plugins""" + ACTIONS = Option.ACTIONS + ("extend",) + STORE_ACTIONS = Option.STORE_ACTIONS + ("extend",) + TYPED_ACTIONS = Option.TYPED_ACTIONS + ("extend",) + + def take_action(self, action, dest, opt, value, values, parser): + """ Performs list extension on plugins """ + if action == "extend": + try: + lvalue = value.split(",") + except: + pass + else: + values.ensure_value(dest, deque()).extend(lvalue) + else: + Option.take_action(self, action, dest, opt, value, values, parser) + +def parse_options(opts): + """ Parse command line options """ + + __cmdParser__ = OptionParserExtended(option_class=SosOption) + __cmdParser__.add_option("-l", "--list-plugins", action="store_true", \ + dest="listPlugins", default=False, \ + help="list plugins and available plugin options") + __cmdParser__.add_option("-n", "--skip-plugins", action="extend", \ + dest="noplugins", type="string", \ + help="skip these plugins", default = deque()) + __cmdParser__.add_option("-e", "--enable-plugins", action="extend", \ + dest="enableplugins", type="string", \ + help="enable these plugins", default = deque()) + __cmdParser__.add_option("-o", "--only-plugins", action="extend", \ + dest="onlyplugins", type="string", \ + help="enable these plugins only", default = deque()) + __cmdParser__.add_option("-k", action="extend", \ + dest="plugopts", type="string", \ + help="plugin options in plugname.option=value format (see -l)") + __cmdParser__.add_option("-a", "--alloptions", action="store_true", \ + dest="usealloptions", default=False, \ + help="enable all options for loaded plugins") + __cmdParser__.add_option("-u", "--upload", action="store", \ + dest="upload", default=False, \ + help="upload the report to an ftp server") + #__cmdParser__.add_option("--encrypt", action="store_true", \ + # dest="encrypt", default=False, \ + # help="encrypt with GPG using Red Hat support's public key") + __cmdParser__.add_option("--batch", action="store_true", \ + dest="batch", default=False, \ + help="do not ask any question (batch mode)") + __cmdParser__.add_option("--build", action="store_true", \ + dest="build", default=False, \ + help="keep sos tree available and dont package results") + __cmdParser__.add_option("--no-colors", action="store_true", \ + dest="nocolors", default=False, \ + help="do not use terminal colors for text") + __cmdParser__.add_option("-v", "--verbose", action="count", \ + dest="verbosity", \ + help="increase verbosity") + __cmdParser__.add_option("--debug", action="count", \ + dest="debug", \ + help="enabling debugging through python debugger") + __cmdParser__.add_option("--ticket-number", action="store", \ + dest="ticketNumber", \ + help="set ticket number") + __cmdParser__.add_option("--name", action="store", \ + dest="customerName", \ + help="define customer name") + __cmdParser__.add_option("--config-file", action="store", \ + dest="config_file", \ + help="specify alternate configuration file") + __cmdParser__.add_option("--tmp-dir", action="store", \ + dest="tmp_dir", \ + help="specify alternate temporary directory", default="/tmp") + __cmdParser__.add_option("--diagnose", action="store_true", \ + dest="diagnose", \ + help="enable diagnostics", default=False) + __cmdParser__.add_option("--analyze", action="store_true", \ + dest="analyze", \ + help="enable analyzations", default=False) + __cmdParser__.add_option("--report", action="store_true", \ + dest="report", \ + help="Enable html/xml reporting", default=False) + __cmdParser__.add_option("--profile", action="store_true", \ + dest="profiler", \ + help="turn on profiling", default=False) + + (GlobalVars.__cmdLineOpts__, GlobalVars.__cmdLineArgs__) = __cmdParser__.parse_args(opts) + +def textcolor(text, color, raw=0): + """ Terminal text coloring function """ + if GlobalVars.__cmdLineOpts__.nocolors: + return text + colors = { "black":"30", "red":"31", "green":"32", "brown":"33", "blue":"34", + "purple":"35", "cyan":"36", "lgray":"37", "gray":"1;30", "lred":"1;31", + "lgreen":"1;32", "yellow":"1;33", "lblue":"1;34", "pink":"1;35", + "lcyan":"1;36", "white":"1;37" } + opencol = "\033[" + closecol = "m" + clear = opencol + "0" + closecol + f = opencol + colors[color] + closecol + del raw + return "%s%s%s" % (f, text, clear) + +class XmlReport: + """ Report build class """ + def __init__(self): + try: + import libxml2 + except ImportError: + self.enabled = False + return + else: + self.enabled = False + return + self.doc = libxml2.newDoc("1.0") + self.root = self.doc.newChild(None, "sos", None) + self.commands = self.root.newChild(None, "commands", None) + self.files = self.root.newChild(None, "files", None) + + def add_command(self, cmdline, exitcode, stdout = None, stderr = None, + f_stdout=None, f_stderr=None, runtime=None): + """ Appends command run into report """ + if not self.enabled: + return + + cmd = self.commands.newChild(None, "cmd", None) + + cmd.setNsProp(None, "cmdline", cmdline) + + cmdchild = cmd.newChild(None, "exitcode", str(exitcode)) + + if runtime: + cmd.newChild(None, "runtime", str(runtime)) + + if stdout or f_stdout: + cmdchild = cmd.newChild(None, "stdout", stdout) + if f_stdout: + cmdchild.setNsProp(None, "file", f_stdout) + + if stderr or f_stderr: + cmdchild = cmd.newChild(None, "stderr", stderr) + if f_stderr: + cmdchild.setNsProp(None, "file", f_stderr) + + def add_file(self, fname, stats): + """ Appends file(s) added to report """ + if not self.enabled: + return + + cfile = self.files.newChild(None, "file", None) + + cfile.setNsProp(None, "fname", fname) + + cchild = cfile.newChild(None, "uid", str(stats[ST_UID])) + cchild = cfile.newChild(None, "gid", str(stats[ST_GID])) + cfile.newChild(None, "mode", str(oct(S_IMODE(stats[ST_MODE])))) + cchild = cfile.newChild(None, "ctime", strftime('%a %b %d %H:%M:%S %Y', + localtime(stats[ST_CTIME]))) + cchild.setNsProp(None, "tstamp", str(stats[ST_CTIME])) + cchild = cfile.newChild(None, "atime", strftime('%a %b %d %H:%M:%S %Y', + localtime(stats[ST_ATIME]))) + cchild.setNsProp(None, "tstamp", str(stats[ST_ATIME])) + cchild = cfile.newChild(None, "mtime", strftime('%a %b %d %H:%M:%S %Y', + localtime(stats[ST_MTIME]))) + cchild.setNsProp(None, "tstamp", str(stats[ST_MTIME])) + + def serialize(self): + """ Serializes xml """ + if not self.enabled: + return + + print self.doc.serialize(None, 1) + + def serialize_to_file(self, fname): + """ Serializes to file """ + if not self.enabled: + return + + outfn = open(fname,"w") + outfn.write(self.doc.serialize(None, 1)) + outfn.close() + +# if debugging is enabled, allow plugins to raise exceptions +def isDebug(): + """ Enable plugin to raise exception """ + if GlobalVars.__cmdLineOpts__.debug: + sys.excepthook = doException + GlobalVars.__raisePlugins__ = 1 + else: + GlobalVars.__raisePlugins__ = 0 + +def sosreport(opts): + """ + This is the top-level function that gathers + and processes all sosreport information + """ + parse_options(opts) + # check debug + isDebug() + + config = ConfigParser.ConfigParser() + if GlobalVars.__cmdLineOpts__.config_file: + config_file = GlobalVars.__cmdLineOpts__.config_file + else: + config_file = '/etc/sos.conf' + try: + config.readfp(open(config_file)) + except IOError: + pass + + GlobalVars.loadedplugins = deque() + skippedplugins = deque() + alloptions = deque() + + # perhaps we should automatically locate the policy module?? + GlobalVars.policy = sos.policyredhat.SosPolicy() + + # find the plugins path + paths = sys.path + for path in paths: + if path.strip()[-len("site-packages"):] == "site-packages" \ + and os.path.isdir(path + "/sos/plugins"): + pluginpath = path + "/sos/plugins" + + # Set up common info and create destinations + + GlobalVars.dstroot = GlobalVars.policy.getDstroot(GlobalVars.__cmdLineOpts__.tmp_dir) + if not GlobalVars.dstroot: + print _("Aborting.") + doExit(1) + + cmddir = os.path.join(GlobalVars.dstroot, "sos_commands") + logdir = os.path.join(GlobalVars.dstroot, "sos_logs") + rptdir = os.path.join(GlobalVars.dstroot, "sos_reports") + try: + os.mkdir(cmddir, 0755) + os.mkdir(logdir, 0755) + os.mkdir(rptdir, 0755) + except Exception as e: + print _("Failed to create temporary directory:") + print e + print _("Aborting.") + doExit(1) + + # initialize logging + soslog = logging.getLogger('sos') + soslog.setLevel(logging.DEBUG) + + if GlobalVars.__cmdLineOpts__.profiler: + proflog = logging.getLogger('sosprofile') + proflog.setLevel(logging.DEBUG) + else: + proflog = None + + # limit verbosity to DEBUG + if GlobalVars.__cmdLineOpts__.verbosity > 3: + GlobalVars.__cmdLineOpts__.verbosity = 3 + + # if stdin is not a tty, disable colors and don't ask questions + if not sys.stdin.isatty(): + GlobalVars.__cmdLineOpts__.nocolors = True + GlobalVars.__cmdLineOpts__.batch = True + + # log to a file + flog = logging.FileHandler(logdir + "/sos.log") + flog.setFormatter(logging.Formatter('%(asctime)s %(levelname)s: %(message)s')) + if GlobalVars.__cmdLineOpts__.verbosity > 0: + # standard log levels have a step of 10 + flog.setLevel(logging.INFO - (GlobalVars.__cmdLineOpts__.verbosity * 10)) + else: + flog.setLevel(logging.INFO) + soslog.addHandler(flog) + + if GlobalVars.__cmdLineOpts__.profiler: + # setup profile log + plog = logging.FileHandler(logdir + "/sosprofile.log") + plog.setFormatter(logging.Formatter('%(message)s')) + plog.setLevel(logging.DEBUG) + proflog.addHandler(plog) + + # define a Handler which writes INFO messages or higher to the sys.stderr + console = logging.StreamHandler(sys.stderr) + if GlobalVars.__cmdLineOpts__.verbosity > 0: + # standard log levels have a step of 10 + console.setLevel(logging.WARNING - (GlobalVars.__cmdLineOpts__.verbosity * 10)) + else: + console.setLevel(logging.WARNING) + console.setFormatter(logging.Formatter('%(message)s')) + soslog.addHandler(console) + + xmlrep = XmlReport() + + # set up dict so everyone can share the following + commons = {'dstroot': GlobalVars.dstroot, 'cmddir': cmddir, 'logdir': logdir, 'rptdir': rptdir, + 'soslog': soslog, 'proflog': proflog, 'policy': GlobalVars.policy, 'verbosity' : GlobalVars.__cmdLineOpts__.verbosity, + 'xmlreport' : xmlrep, 'cmdlineopts':GlobalVars.__cmdLineOpts__, 'config':config } + + # Make policy aware of the commons + GlobalVars.policy.setCommons(commons) + + print + print _("sosreport (version %s)" % (__version__,)) + print + + # disable plugins that we read from conf files + conf_disable_plugins_list = deque() + conf_disable_plugins = None + if config.has_option("plugins", "disable"): + conf_disable_plugins = config.get("plugins", "disable").split(',') + for item in conf_disable_plugins: + conf_disable_plugins_list.append(item.strip()) + + # generate list of available plugins + plugins = os.listdir(pluginpath) + plugins.sort() + plugin_names = deque() + + # validate and load plugins + for plug in plugins: + plugbase = plug[:-3] + if not plug[-3:] == '.py' or plugbase == "__init__": + continue + try: + if GlobalVars.policy.validatePlugin(pluginpath + plug): + pluginClass = importPlugin("sos.plugins." + plugbase, plugbase) + else: + soslog.warning(_("plugin %s does not validate, skipping") % plug) + skippedplugins.append((plugbase, pluginClass(plugbase, commons))) + continue + # plug-in is valid, let's decide whether run it or not + plugin_names.append(plugbase) + if plugbase in GlobalVars.__cmdLineOpts__.noplugins or \ + plugbase in conf_disable_plugins_list: + # skipped + skippedplugins.append((plugbase, pluginClass(plugbase, commons))) + continue + if not pluginClass(plugbase, commons).checkenabled() and \ + not plugbase in GlobalVars.__cmdLineOpts__.enableplugins and \ + not plugbase in GlobalVars.__cmdLineOpts__.onlyplugins: + # inactive + skippedplugins.append((plugbase, pluginClass(plugbase, commons))) + continue + if not pluginClass(plugbase, commons).defaultenabled() and \ + not plugbase in GlobalVars.__cmdLineOpts__.enableplugins and \ + not plugbase in GlobalVars.__cmdLineOpts__.onlyplugins: + # not loaded by default + skippedplugins.append((plugbase, pluginClass(plugbase, commons))) + continue + if GlobalVars.__cmdLineOpts__.onlyplugins and \ + not plugbase in GlobalVars.__cmdLineOpts__.onlyplugins: + # not specified + skippedplugins.append((plugbase, pluginClass(plugbase, commons))) + continue + GlobalVars.loadedplugins.append((plugbase, pluginClass(plugbase, commons))) + except: + soslog.warning(_("plugin %s does not install, skipping") % plug) + if GlobalVars.__raisePlugins__: + raise + + # First, gather and process options + # using the options specified in the command line (if any) + if GlobalVars.__cmdLineOpts__.usealloptions: + for plugname, plug in GlobalVars.loadedplugins: + for name, parms in zip(plug.optNames, plug.optParms): + if type(parms["enabled"])==bool: + parms["enabled"] = True + del name + + # read plugin tunables from configuration file + if config.has_section("tunables"): + if not GlobalVars.__cmdLineOpts__.plugopts: + GlobalVars.__cmdLineOpts__.plugopts = deque() + + for opt, val in config.items("tunables"): + if not opt.split('.')[0] in conf_disable_plugins_list: + GlobalVars.__cmdLineOpts__.plugopts.append(opt + "=" + val) + + if GlobalVars.__cmdLineOpts__.plugopts: + opts = {} + for opt in GlobalVars.__cmdLineOpts__.plugopts: + # split up "general.syslogsize=5" + try: + opt, val = opt.split("=") + except: + val = True + else: + if val.lower() in ["off", "disable", "disabled", "false"]: + val = False + else: + # try to convert string "val" to int() + try: + val = int(val) + except: + pass + + # split up "general.syslogsize" + try: + plug, opt = opt.split(".") + except: + plug = opt + opt = True + + try: + opts[plug] + except KeyError: + opts[plug] = deque() + opts[plug].append( (opt, val) ) + + for plugname, plug in GlobalVars.loadedplugins: + if plugname in opts: + for opt, val in opts[plugname]: + if not plug.setOption(opt, val): + soslog.error('no such option "%s" for plugin ' \ + '(%s)' % (opt,plugname)) + doExit(1) + del opts[plugname] + for plugname in opts.keys(): + soslog.error('unable to set option for disabled or non-existing ' \ + 'plugin (%s)' % (plugname)) + # Do not want to exit on invalid opts due to a misconfiguration in sos.conf + # doExit(1) + del opt, opts, val + + # error if the user references a plugin which does not exist + unk_plugs = [plugname.split(".")[0] for plugname in \ + GlobalVars.__cmdLineOpts__.onlyplugins \ + if not plugname.split(".")[0] in plugin_names] + unk_plugs += [plugname.split(".")[0] for plugname in \ + GlobalVars.__cmdLineOpts__.noplugins \ + if not plugname.split(".")[0] in plugin_names] + unk_plugs += [plugname.split(".")[0] for plugname in \ + GlobalVars.__cmdLineOpts__.enableplugins \ + if not plugname.split(".")[0] in plugin_names] + if len(unk_plugs): + for plugname in unk_plugs: + soslog.error('a non-existing plugin (%s) was specified in the ' \ + 'command line' % (plugname)) + doExit(1) + del unk_plugs + + for plugname, plug in GlobalVars.loadedplugins: + names, parms = plug.getAllOptions() + for optname, optparm in zip(names, parms): + alloptions.append((plug, plugname, optname, optparm)) + + # when --listplugins is specified we do a dry-run + # which tells the user which plugins are going to be enabled + # and with what options. + + if GlobalVars.__cmdLineOpts__.listPlugins: + if not len(GlobalVars.loadedplugins) and not len(skippedplugins): + soslog.error(_("no valid plugins found")) + doExit(1) + + if len(GlobalVars.loadedplugins): + print _("The following plugins are currently enabled:") + print + for (plugname, plug) in GlobalVars.loadedplugins: + print " %-25s %s" % (textcolor(plugname,"lblue"), + plug.get_description()) + else: + print _("No plugin enabled.") + print + + if len(skippedplugins): + print _("The following plugins are currently disabled:") + print + for (plugname, plugclass) in skippedplugins: + print " %-25s %s" % (textcolor(plugname,"cyan"), + plugclass.get_description()) + print + + if len(alloptions): + print _("The following plugin options are available:") + print + for (plug, plugname, optname, optparm) in alloptions: + # format and colorize option value based on its type (int or bool) + if type(optparm["enabled"]) == bool: + if optparm["enabled"] == True: + tmpopt = textcolor("on","lred") + else: + tmpopt = textcolor("off","red") + elif type(optparm["enabled"]) == int: + if optparm["enabled"] > 0: + tmpopt = textcolor(optparm["enabled"],"lred") + else: + tmpopt = textcolor(optparm["enabled"],"red") + else: + tmpopt = optparm["enabled"] + + print " %-21s %-5s %s" % (plugname + "." + optname, + tmpopt, optparm["desc"]) + del tmpopt + else: + print _("No plugin options available.") + + print + doExit() + + # to go anywhere further than listing the + # plugins we will need root permissions. + if os.getuid() != 0: + print _('sosreport requires root permissions to run.') + doExit(1) + + # we don't need to keep in memory plugins we are not going to use + del skippedplugins + + if not len(GlobalVars.loadedplugins): + soslog.error(_("no valid plugins were enabled")) + doExit(1) + + msg = _(""" +This command will collect diagnostic and configuration \ +information from this %(distro)s system and installed \ +applications. + +An archive containing the collected information will be \ +generated in %(tmpdir)s and may be provided to a %(vendor)s \ +support representative. + +Any information provided to %(vendor)s will be treated in \ +accordance with the published support policies at:\n + +%(vendor_url)s + +The generated archive may contain data considered sensitive \ +and its content should be reviewed by the originating \ +organization before being passed to any third party. + +No changes will be made to system configuration. +%(vendor_text)s +""" % {'distro':__distro__, 'vendor':__vendor__, + 'vendor_url': __vendor_url, + 'tmpdir': GlobalVars.__cmdLineOpts__.tmp_dir, + 'vendor_text': ""}) + _msg = "" + for line in msg.splitlines(): + _msg = (_msg + + fill(" " + line + "\n", 58, replace_whitespace = False) + + "\n") + msg = _msg + + if GlobalVars.__cmdLineOpts__.batch: + print msg + else: + msg += _("""Press ENTER to continue, or CTRL-C to quit.\n""") + try: + raw_input(msg) + except: + print + doExit() + del msg + + if GlobalVars.__cmdLineOpts__.diagnose: + # Call the diagnose() method for each plugin + tmpcount = 0 + for plugname, plug in GlobalVars.loadedplugins: + try: + plug.diagnose() + except: + if GlobalVars.__raisePlugins__: + raise + else: + error_log = open(logdir + "/sosreport-plugin-errors.txt", "a") + etype, eval, etrace = sys.exc_info() + traceback.print_exception(etype, eval, etrace, limit=2, file=sys.stdout) + error_log.write(traceback.format_exc()) + error_log.close() + + tmpcount += len(plug.diagnose_msgs) + if tmpcount > 0: + print _("One or more plugins have detected a problem in your " \ + "configuration.") + print _("Please review the following messages:") + print + + fp = open(rptdir + "/diagnose.txt", "w") + for plugname, plug in GlobalVars.loadedplugins: + for tmpcount2 in range(0, len(plug.diagnose_msgs)): + if tmpcount2 == 0: + soslog.warning( textcolor("%s:" % plugname, "red") ) + soslog.warning(" * %s" % plug.diagnose_msgs[tmpcount2]) + fp.write("%s: %s\n" % (plugname, plug.diagnose_msgs[tmpcount2])) + fp.close() + + print + if not GlobalVars.__cmdLineOpts__.batch: + try: + while True: + yorno = raw_input( _("Are you sure you would like to " \ + "continue (y/n) ? ") ) + if yorno == _("y") or yorno == _("Y"): + print + break + elif yorno == _("n") or yorno == _("N"): + doExit(0) + del yorno + except KeyboardInterrupt: + print + doExit(0) + + GlobalVars.policy.preWork() + + # Call the setup() method for each plugin + for plugname, plug in GlobalVars.loadedplugins: + try: + plug.setup() + except IOError as e: + if e.errno in (errno.ENOSPC, errno.EROFS): + print _("Fatal error writing archive:") + print e + print _("Aborting.") + doExit(1) + + except KeyboardInterrupt: + raise + except: + if GlobalVars.__raisePlugins__: + raise + else: + error_log = open(logdir + "/sosreport-plugin-errors.txt", "a") + etype, eval, etrace = sys.exc_info() + traceback.print_exception(etype, eval, etrace, limit=2, file=sys.stdout) + error_log.write(traceback.format_exc()) + error_log.close() + + print _(" Running plugins. Please wait ...") + print + plugruncount = 0 + for i in izip(GlobalVars.loadedplugins): + plugruncount += 1 + sys.stdout.write("\r Completed [%d/%d] ... " % (plugruncount, + len(GlobalVars.loadedplugins))) + sys.stdout.flush() + plugname, plug = i[0] + try: + plug.copyStuff() + except IOError as e: + if e.errno in (errno.ENOSPC, errno.EROFS): + print + print _("Fatal error writing archive:") + print e + print _("Aborting.") + doExit(1) + except KeyboardInterrupt: + raise + except: + if GlobalVars.__raisePlugins__: + raise + else: + error_log = open(logdir + "/sosreport-plugin-errors.txt", "a") + etype, eval, etrace = sys.exc_info() + traceback.print_exception(etype, eval, etrace, limit=2, file=sys.stdout) + error_log.write(traceback.format_exc()) + error_log.close() + + print + + if GlobalVars.__cmdLineOpts__.report: + for plugname, plug in GlobalVars.loadedplugins: + for oneFile in plug.copiedFiles: + try: + xmlrep.add_file(oneFile["srcpath"], os.stat(oneFile["srcpath"])) + except: + pass + + xmlrep.serialize_to_file(rptdir + "/sosreport.xml") + + if GlobalVars.__cmdLineOpts__.analyze: + # Call the analyze method for each plugin + for plugname, plug in GlobalVars.loadedplugins: + try: + plug.analyze() + except: + # catch exceptions in analyze() and keep working + pass + + if GlobalVars.__cmdLineOpts__.report: + # Generate the header for the html output file + rfd = open(rptdir + "/" + "sosreport.html", "w") + rfd.write(""" + + + + + + Sos System Report + + + + """) + + + # Make a pass to gather Alerts and a list of module names + allAlerts = deque() + plugNames = deque() + for plugname, plug in GlobalVars.loadedplugins: + for alert in plug.alerts: + allAlerts.append('%s: %s' % (plugname, plugname, + alert)) + plugNames.append(plugname) + + # Create a table of links to the module info + rfd.write("

Loaded Plugins:

") + rfd.write("\n") + rr = 0 + for i in range(len(plugNames)): + rfd.write('\n' % (plugNames[i], + plugNames[i])) + rr = divmod(i, 4)[1] + if (rr == 3): + rfd.write('') + if not (rr == 3): + rfd.write('') + rfd.write('
%s
\n') + + rfd.write('

Alerts:

') + rfd.write('') + + + # Call the report method for each plugin + for plugname, plug in GlobalVars.loadedplugins: + try: + html = plug.report() + except: + if GlobalVars.__raisePlugins__: + raise + else: + rfd.write(html) + + rfd.write("") + + rfd.close() + + # Call the postproc method for each plugin + for plugname, plug in GlobalVars.loadedplugins: + try: + plug.postproc() + except: + if GlobalVars.__raisePlugins__: + raise + else: + error_log = open(logdir + "/sosreport-plugin-errors.txt", "a") + etype, eval, etrace = sys.exc_info() + traceback.print_exception(etype, eval, etrace, limit=2, file=sys.stdout) + error_log.write(traceback.format_exc()) + error_log.close() + + if GlobalVars.__cmdLineOpts__.build: + print + print _(" sosreport build tree is located at : %s" % (GlobalVars.dstroot,)) + print + return GlobalVars.dstroot + + # package up the results for the support organization + if GlobalVars.policy.packageResults(): + print + print _("Failed to create compressed archive.") + print + print _(" sosreport build tree is located at : %s" % (GlobalVars.dstroot,)) + return GlobalVars.dstroot + + # delete gathered files + GlobalVars.policy.cleanDstroot() + + # let's encrypt the tar-ball + #if GlobalVars.__cmdLineOpts__.encrypt: + # policy.encryptResults() + + # automated submission will go here + if not GlobalVars.__cmdLineOpts__.upload: + GlobalVars.policy.displayResults() + else: + GlobalVars.policy.uploadResults() + + # Close all log files and perform any cleanup + logging.shutdown() +